Commit Graph

699 Commits

Author SHA1 Message Date
Manolo Gouy 69ec698e41 Mac OS: modified CMake config files to allow use of OPTION_APPLE_X11
to build an X11-using version of FLTK on the Mac OS platform.
This matches the recent support of the --enable-x11 option
by the configure script on the mac.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-31 06:19:59 +00:00
Albrecht Schlosser 4f5e6e7732 Harmonize configure and CMake build system (part 1).
The files "config.h" generated by configure and CMake are now almost
identical, except a few comments and some still missing or failing
config tests, for instance checks for some functions in libraries.
[Note: tested and compared on Linux.]

configh.cmake.in: Fixed many #cmakedefine and #cmakedefine01 statements
  so they #define their variables as 0 or 1, or /* #undef */ it, resp.,
  as it is done in the configure build.

Added tests:
  - libXrender

Fixed tests:
  - function glXGetProcAddressARB

Todo (still failing tests in CMake):
  - HAVE_PNG_GET_VALID
  - HAVE_PNG_SET_TRNS_TO_ALPHA
  - HAVE_DLSYM

Other remaining issues:
  - compiler flags introduced in configure/make build
  - HAVE_SYS_NDIR_H - maybe missing test in configure ?
  - HAVE_SYS_DIR_H  - maybe missing test in configure ?
  - HAVE_NDIR_H     - maybe missing test in configure ?
  - WORDS_BIGENDIAN and #include <mac_endianness.h> ...
    i.e. Mac OS X specific #include needed or not ?



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10984 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-30 14:37:35 +00:00
Manolo Gouy 43bfe74b25 Running FLTK in static initializers (cont'd):
1) Changed the way fluid attaches images to widgets and menu items so
it is compatible with running fluid-generated code containing such images
in a static initializer. Images are now attached calling a function:
  widget->image( image_function_name() );
and this function is defined before in fluid-generated code as:
   static Fl_Image *image_function_name() {
     static Fl_Image *image = new image_type(......);
     return image;
   }

2) Changed src/Fl_File_Chooser.fl so the source code generate by fluid
from it is compatible with running in a static initializer.

3) Changed src/Fl_File_Chooser.cxx and FL/Fl_File_Chooser.H
to the result of running fluid on src/Fl_File_Chooser.fl 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10972 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-18 18:56:58 +00:00
Albrecht Schlosser 3666209659 Finish "rename" of *.xcf.gz - delete uncompressed files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10930 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 14:43:20 +00:00
Albrecht Schlosser bf873db029 Rename *.xcf.gz files to *.xcf_gz instead of uncompressing.
This is intended circumvent the Apache/Subversion protocol issue
described by Ian in the previous few commits.

Todo: If this works we can remove the uncompressed files again ...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10929 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 14:37:37 +00:00
Ian MacArthur a2b8700a82 Replace the "renamed" fluid.xcf[.gz] file that
was blocking repository access for checkouts.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10927 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 11:51:06 +00:00
Ian MacArthur df12bf6c66 Attempting to unblcok repository access.
The Apache server is currently mis-handling
files with a .gz extension, and this causes
checksum errors and blocks checkouts etc.

Renaming the files does not work (it also
fails) but it seems deleting the files, then
adding them back with a "new" name does work.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10926 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 11:49:30 +00:00
Albrecht Schlosser 144c656360 Fixed missing image release as described in STR #2840.
Thanks to OP (Nikego) and Matt!


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10888 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-07 00:11:45 +00:00
Albrecht Schlosser d7d57f9113 Fixed copyright year, updated CHANGES.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10881 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-03 15:45:41 +00:00
Albrecht Schlosser 2aae73febc Fix out-of-bounds memory access in fluid (STR #3263).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10880 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-03 15:08:54 +00:00
Albrecht Schlosser 99c536234e Add light gray separator line to fluid widget browser (STR #2997).
Also fix some comments.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10824 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-08-01 19:04:07 +00:00
Albrecht Schlosser a2e13ee3a2 Fix documentation, adjust comments in fluid/Fl_Type.cxx.
No code changes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10813 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-23 00:22:42 +00:00
Albrecht Schlosser 01cbcc8406 Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10811 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-22 23:20:47 +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
Albrecht Schlosser 9488810968 Fix trailing white space in fluid .fl files (STR #3239).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10782 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-09 01:17:33 +00:00
Albrecht Schlosser 5573c35ff1 Fix spelling errors and improve documentation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-15 20:24:41 +00:00
Albrecht Schlosser 6b8f3c6027 Fix compiler warnings in fluid-generated code (STR #2813).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10696 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-10 19:26:17 +00:00
Manolo Gouy 6496fd33be CMake generation of Xcode project under Mac OS: bundle fluid with its proper icon.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10684 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-07 16:08:54 +00:00
Matthias Melcher c4b0a2f3bf Tricking Fl_Text_Display into using bearable colors for CodeView in Fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10672 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-04 15:06:30 +00:00
Matthias Melcher 326b64d278 STR #3184: fixed code editor in Fluid to check the previous line for a block comment style in the last character. If so, the previous line is include in the calculation of the current line. This seems to fix issues when changing the block-comment character combination '*/' by deleting a character or adding one in the middle.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10671 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-04 11:17:38 +00:00
Albrecht Schlosser 33f61316fc Fix typo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10669 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-03 19:39:45 +00:00
Albrecht Schlosser d6bcdbe375 Remove useless cast that would break Windows 64-bit compilation.
This cast broke Windows 64-bit compilation with a hard error.
$ x86_64-w64-mingw32-g++ --version
x86_64-w64-mingw32-g++ (GCC) 4.8.3
Error message:
widget_panel.cxx:82:41: error: cast from ‘void*’ to ‘long int’ loses precision [-fpermissive]
 wCallback->do_callback(wCallback, (long)v);
                                         ^


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10668 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-03 16:15:14 +00:00
Matthias Melcher d5a8755ead Added comments to Fluid Widgets. The comment field is between the Additional Code and Callback field on the C++ Tab of the Widget Editor. Care was taken to correctly resize.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10659 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-02 17:19:33 +00:00
Matthias Melcher 552502d44a Fixed the Tab order in Fluid dialogs that contain a comment field. The comment field can no longer have tabs in it anymore (hey, it's either that or the other, right?). But I believe that this is a limitation that the user can easily live with. It's just comments, not code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10658 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-02 14:08:18 +00:00
Matthias Melcher 61a7bf60f9 Finally fixed the order of arrow and icon in the Type browser in Fluid.
Boy, this has been bothering me since the early eighties (or whenever
I checked that in first). Sorry that it took me a little while.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10657 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-01 15:33:44 +00:00
Albrecht Schlosser ae4b51b970 Remove obsolete watcom makefiles.
These makefiles included '../watcom.mif' which had already been removed
and they had not been updated anyway.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10634 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-17 14:53:09 +00:00
Albrecht Schlosser 4798d70ded Update copyright (year) in generated fluid files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10627 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-16 18:03:16 +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
Albrecht Schlosser c96c4c35b0 Add 'fluid -u' command-line switch to upgrade fluid files in batch mode.
This option opens a fluid ('.fl') file and saves it overwriting the old
file with the current syntax and library version number.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-09 20:37:45 +00:00
Albrecht Schlosser 78783e1fd8 Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10608 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-07 13:12:54 +00:00
Albrecht Schlosser 6390a0e09e [CMake] Improve installation, support DESTDIR, and more (STR #3149).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-02-16 14:30:27 +00:00
Manolo Gouy 09230a9878 Removed compilation warning when compiling fluid/file.cxx on apple.
Also, added explanatory comment of the purpose of a GNUC-specific
attribute in FL/fl_ask.H

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10501 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-12-20 15:00:27 +00:00
Greg Ercolano 889a8a6d42 Fixes STR #3169, comments #4, #5 and #7.
Prevents warnings from the OSX 10.9.x clang compiler.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10493 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-12-19 03:47:32 +00:00
Albrecht Schlosser f500ff46e2 Update dependencies for FLTK 1.3.3 release.
This should be the final commit for FLTK 1.3.3.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10431 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-11-03 10:34:54 +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 fd04b88260 Fix regression introduced in svn r10331.
Didn't build in Windows IDE projects because of missing snprintf().


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10420 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 17:24:57 +00:00
Ian MacArthur f344e4a459 Adjust fluid/file.cxx so that it builds again on OSX.
I don't think this change will prevent the prior "fix"
workaround that Albrecht made from working on cygwin...

Probably!



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10381 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-15 20:51:39 +00:00
Albrecht Schlosser de1d03cd52 Fix sporadic floating point value comparison error.
I wonder why this did not appear earlier. I found this issue only
when compiling with Cygwin under certain circumstances. Error was:

  Generating tabs.cxx and header from tabs.fl...
  tabs.fl:2: unknown version '1.0303'

although fluid was the one linked under FLTK 1.3.3 in the build process.
The fix is to adjust FL_VERSION by a delta value of 0.00001.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10380 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-15 12:36:26 +00:00
Albrecht Schlosser 02b1646d0e Make image data 'const' for all image types in fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10358 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-05 11:56:06 +00:00
Albrecht Schlosser aef482198e Bump version numbers to 1.3.3.
All fluid .fl files have been rewritten with fluid 1.3.3 and may differ
somehow, but there are no significant changes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10353 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-05 00:03:27 +00:00
Manolo Gouy bbefe857db Added control of the Fl::OPTION_FNFC_USES_GTK option in the "Edit/Global FLTK Settings" menu item of fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10347 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-30 13:06:35 +00:00
Manolo Gouy 0a77482bba These files should be created by fluid from alignment_panel.fl. So, back to their previous versions.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10346 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-30 10:25:06 +00:00
Manolo Gouy 77b160e19d Added control of the Fl::OPTION_FNFC_USES_GTK option in the "Edit/Global FLTK Settings" menu item of fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-30 09:07:35 +00:00
Albrecht Schlosser 318c3619dc CMake enhancements, as discussed in STR #3055.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-27 00:41:06 +00:00
Albrecht Schlosser 5b774e9970 Use fl_ascii_strcasecmp in fluid/factory.cxx (STR #3006).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10336 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-25 10:37:35 +00:00
Albrecht Schlosser 023589e703 Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10333 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-22 19:07:55 +00:00
Albrecht Schlosser de3fd7574f Generate version number in fluid's about panel automatically.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10331 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-22 18:22:02 +00:00
Lauri Kasanen bbc8782b6a Move Xutf8.h to src/, update includes, refresh makedepends
This is an internal header.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10248 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-08-23 08:41:58 +00:00
Greg Ercolano 2c820fd53d Fixes for STR#3085; fluid UI layout clipping issues.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10149 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-17 20:46:25 +00:00
Greg Ercolano 4c301eb6f9 Small template panel widget positioning/sizes
to prevent labels clipping (on linux).



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10148 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-17 18:43:11 +00:00