Commit Graph

205 Commits

Author SHA1 Message Date
Albrecht Schlosser
e934dd5468 Fix compiler warnings (STR #2988).
gcc issued lots of warnings if compiled with -Wundef. This shows access
to undefined preprocessor macros, particularly for config tests.

This update is similar, but not identical to fltk-cpp-fixes.patch as
posted on STR #2988 (file #1). There have been changes in the configure
script and the  macros in configh.in and configh.cmake.in meanwhile.

This commit compiles with -Wundef w/o such warnings under Linux and
Windows (MinGW).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11094 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 02:49:56 +00:00
Albrecht Schlosser
70f66d5ded Delete obsolete FL/ folder in ide/VisualC6.
ide/VisualC6/FL/abi-version.h is not used anymore.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-24 23:10:14 +00:00
Greg Ercolano
8f72a7a790 Small tweak for one of VS's macros.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-24 01:47:58 +00:00
Greg Ercolano
a50000484d If FL/abi-version.h doesn't exist, it's created from abi-version.ide
(STR#3249)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11041 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-24 01:35:22 +00:00
Manolo Gouy
1a1c68e0c5 Changed the run-script so t copies abi-version.ide to FL/abi-version.h
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11014 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-20 05:41:25 +00:00
Manolo Gouy
1a9f105ef6 Added 'run script phase' that copies abi-version.ide
to ide/Xcode4/FL/abi-version.h before building the FLTK library.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11011 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-19 17:42:30 +00:00
Albrecht Schlosser
2b6c2bc7af Make VisualC2008/2010 projects create FL/abi-version.h (STR #3249).
First step towards a hopefully clean creation of FL/abi-version.h for all
Windows (Visual Studio) and maybe also Xcode projects (if necessary) in
order to "simulate" configure and CMake methods to create this file.

I could only modify the VisualC2008 and VisualC2010 project files, because
I don't have VisualC6 and/or Xcode. Help needed...

To do for remaining <ide> directories (ide/VisualC6 and maybe ide/Xcode4):

 (1) Remove <ide>/FL folders including <ide>/FL/abi-version.h.
 (2) Add a Pre-Build event or equivalent on project 'fltk' for all
     potential build configurations (Debug, Release, ...)
 (3) Maybe add project dependencies to ensure that the Pre-Build event
     of project 'fltk' is executed before all other projects.

Notes:

 (a) Command line for Pre-Build events of VS2008/2010:
     "copy /Y $(SolutionDir)..\..\abi-version.ide $(SolutionDir)..\..\FL\abi-version.h"
     Something similar should work for VC6 as well.

 (b) While building the projects I found some wrong output settings in zlib
     projects. These have been fixed in this commit as well (unrelated).
     
 (c) .gitignore has been extended to ignore all intermediate build files
     of VS2008/VS2010 ide projects.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11010 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-19 14:02:10 +00:00
Manolo Gouy
8ac33d6b71 Mac OS: Enhanced the application bundle for the editor demo
so it is launchable by dropping any file on its icon. This is
done both for the configure/make and the CMake build systems
(the Xcode build system did that already).
The editor demo is the only one calling fl_open_callback().


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-29 16:41:15 +00:00
Manolo Gouy
6ccbedb5db Better deployment targets for the Release configuration.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10949 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-03 17:27:37 +00:00
Manolo Gouy
403c29267f Mac OS IDE project: localize the application menu of the menubar test app.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10939 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-01 10:19:36 +00:00
Manolo Gouy
3c82a3d736 Mac OS: Show how to localize the "Preferences…" custom application menu item
of the menubar test app.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10938 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-01 10:03:23 +00:00
Manolo Gouy
4f6903eed5 The unittests target had wrong product name, and the animated target did not copy the fltk framework.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10802 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-20 12:50:16 +00:00
Albrecht Schlosser
449e15ecee Add copyright comments, improve comments, don't set FL_ABI_VERSION.
FL_ABI_VERSION should not be set in the IDE projects to avoid having to
update the version numbers for each release.

The default is used if FL_ABI_VERSION is not defined.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10788 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-13 18:17:33 +00:00
Albrecht Schlosser
9adb181156 Make FL_ABI_VERSION configurable (STR #3161).
This commit adds the configure option --with-abiversion and the CMake option
OPTION_ABI_VERSION. Both options can be set e.g. to 10304 to build with
FL_ABI_VERSION = 10304 (FLTK 1.3.4).

For IDE builds there are new files ide/<IDE-NAME>/FL/abi-version.h that
can be edited to change the ABI version before the FLTK lib is built.
Note that this file MUST be copied to the include/FL directory if the
IDE-built library is to be installed.

The default is FL_ABI_VERSION = FL_MAJOR*10000 + FL_MINOR*100 + 0, i.e.
10300 for all FLTK 1.3.x versions to keep binary compatibility (ABI).

Todo: more tests and more documentation.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-12 19:23:55 +00:00
Albrecht Schlosser
c9d8e0feaa Update fluid .fl files and generated code - remove trailing white space.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10783 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-09 02:09:33 +00:00
Manolo Gouy
c0b97d86d4 Simpler target-specific options
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10770 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-21 08:23:21 +00:00
Manolo Gouy
59914ef57d Removed some warnings
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10769 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-21 08:08:39 +00:00
Manolo Gouy
d7aa656044 Remove some minor warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10768 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-21 07:46:16 +00:00
Manolo Gouy
b414576331 Added the libfltk target producing a static FLTK library libfltk.a
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10740 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-02 08:48:39 +00:00
Manolo Gouy
130bbf6efa MacOS Xcode project: give proper icons to the blocks, checkers and sudoku test programs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10693 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-09 11:42:31 +00:00
Manolo Gouy
792cf70daf MacOS: fix XCode4 -> Xcode4 typo
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10692 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-09 11:18:44 +00:00
Manolo Gouy
d2edec0517 MacOS: removed XCode3 from header search paths in Xcode FLTK project,
and fix the help demo.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10691 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-09 11:05:36 +00:00
Manolo Gouy
54773419f9 Changed Xcode-related date.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10650 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-22 07:38:05 +00:00
Manolo Gouy
20e67cd128 Changed eol-style.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10649 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-22 07:35:06 +00:00
Manolo Gouy
15c37362e7 Updated Xcode-related info.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10648 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-22 07:29:07 +00:00
Albrecht Schlosser
78852b1724 Documentation: Update ide/README.IDE
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10646 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-21 16:57:35 +00:00
Manolo Gouy
1a820df25f Reflect in README.OSX.txt the removal of the Xcode project. A single Xcode project is now used.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10640 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-18 11:51:54 +00:00
Manolo Gouy
b055364dd0 Used by the animated demo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10639 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-18 11:35:28 +00:00
Manolo Gouy
e4531949ab Fixed a series of warnings when building with Xcode on Mac OS.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10637 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-18 10:28:13 +00:00
Manolo Gouy
7a7046e4f2 Added the new animated test program. Removed references to the AGL framework.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10636 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-18 10:14:35 +00:00
Albrecht Schlosser
0f45a7adf5 [Version 1.3.4] Update version numbers - hopefully complete.
Note to devs: if I missed something, please mark follow-up commits with
[Version 1.3.4] so we can find the necessary commits for version updates.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10612 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-10 01:41:55 +00:00
Manolo Gouy
006d86b7e9 Removed the Xcode3 directory altogether because Xcode3 is very old
and because Xcode3 opens very well the Xcode4 ide anyway.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10502 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-12-20 15:04:40 +00:00
Manolo Gouy
36c2877a60 Removed use of AGL framework
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10499 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-12-20 08:09:03 +00:00
Greg Ercolano
07131783e5 Fix dependency issue with fltk_imagesdll that was causing
build errors the first time through; it was missing deps
on the fltk_png and fltk_jpeg targets..



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10426 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-31 17:51:40 +00:00
Greg Ercolano
1f7247d9ba Removed /W3 warning flag from vs 7 .net release build for the fltkdll project.
(The other projects have that flag turned off)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10425 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-31 01:21:57 +00:00
Manolo Gouy
c39387eac4 Don’t generate debug symbols in the Release mode
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10424 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 20:45:30 +00:00
Manolo Gouy
9aee477062 Updated version numbers displayed in the "About fluid" menu item under Mac OS X
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10421 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 18:30:37 +00:00
Albrecht Schlosser
3e1da3012a Remove Fl::*sleep() method family, as discussed in fltk.coredev.
Hopefully this doesn't break Windows or Mac OX IDE builds, please help
testing.

Short story: these functions showed compatibility problems, lacked some
quality (regarding interruption by signals), and maybe more.

This is a combined commit that reverts three (3) svn commits. The following
lists are extracted from git, but show the svn revisions and files:

    Remove Fl::*sleep() family, part 1: revert svn r 10287.

:100644 100644 a988702... 794920f... M	ide/Xcode4/FLTK.xcodeproj/project.pbxproj

    Remove Fl::*sleep() family, part 2: revert svn r 10151.

:100644 100644 cf839e6... bfde9c4... M	ide/Xcode3/FLTK.xcodeproj/project.pbxproj
:100644 100644 794920f... c0c772a... M	ide/Xcode4/FLTK.xcodeproj/project.pbxproj

    Remove Fl::*sleep() family, part 2b: revert svn r 10151 (continued).

:100644 100644 bfde9c4... abf2922... M	ide/Xcode3/FLTK.xcodeproj/project.pbxproj

    Remove Fl::*sleep() family, part 3: revert svn r 10150.

:100644 100644 b469018... e76a3e5... M	FL/Fl.H
:100644 100644 7bb7899... 4d4755d... M	ide/VisualC2008/fltk.lib.vcproj
:100644 100644 9d9a2cf... 334aef8... M	ide/VisualC2008/fltkdll.vcproj
:100644 100644 5533a54... e30058b... M	ide/VisualC2010/fltk.lib.vcxproj
:100644 100644 e49f691... 1259c87... M	ide/VisualC2010/fltk.lib.vcxproj.filters
:100644 100644 946f31a... d53ab80... M	src/CMakeLists.txt
:100644 000000 fed36fd... 0000000... D	src/Fl_sleep.cxx
:100644 100644 3d9656c... 3b265f9... M	src/Makefile
:100644 100644 6eadbcb... 5dd5872... M	test/sudoku.cxx


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10419 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 16:05:22 +00:00
Manolo Gouy
82960c272b Replaced Fl_Shaped_Window.cxx by Fl_Window_shape.cxx in VisualC files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10326 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-21 14:38:10 +00:00
Manolo Gouy
f1b2c92fce STR#3093 continued: deleted the Fl_Shaped_Window class. Instead, added new member function Fl_Window::shape(Fl_Image*)
that gives a non-rectangular shape to a standard window. The benefit is that it works with Fl_Double_Window and Fl_Menu_Window as well.
It also works for free with Fl_Gl_Window on the X11 platform only.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-21 14:10:36 +00:00
Manolo Gouy
4f2790d793 Add Fl_PostScript.cxx to list of files compiled in libfltk for VisualC projects.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10292 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-08 16:16:58 +00:00
Manolo Gouy
11f55e80b3 Put Fl_PostScript.cxx in list of files compiled in libfltk rather than including it in Fl_Printer.cxx.
VisualC project files still need to be changed accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10291 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-08 16:03:52 +00:00
Manolo Gouy
2031e30069 Added file src/Fl_sleep.cxx to list of files compiled in target fltk.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10287 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-07 16:52:44 +00:00
Manolo Gouy
8a675919fd Removed file FL/Xutf8.h that moved to src/ and is X11-specific.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10264 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-02 09:28:36 +00:00
Manolo Gouy
8997131377 Added the Fl_Shaped_Window class to support windows of arbitrary shapes.
The new class is fully Doxygen-documented.
Added an example program (example/shapedwindow.cxx) that exercises the new class.
Modified all IDE-supporting files accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10255 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-08-27 11:55:57 +00:00
Greg Ercolano
b18dd182d0 Fixes STR #3103; remove Fl_Sys_Menu_Bar.cxx from all VS ide files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10217 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-07-02 23:34:28 +00:00
Manolo Gouy
cb23b06729 Added new source files Fl_Copy_Surface.cxx & Fl_Image_Surface.cxx to visualC2010
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10169 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-24 14:28:58 +00:00
Manolo Gouy
9c6006ac6f Added new source files Fl_Copy_Surface.cxx & Fl_Image_Surface.cxx to visualC2008
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10168 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-24 14:28:06 +00:00
Manolo Gouy
c92b953db2 Added new source files Fl_Copy_Surface.cxx & Fl_Image_Surface.cxx to visual c 6
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10167 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-24 14:11:22 +00:00
Manolo Gouy
07dd8ba328 Added copy/paste from/to FLTK applications of graphical data.
Added Fl_Image_Surface class to draw into an Fl_Image object.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10159 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-23 16:47:21 +00:00