Commit Graph

32 Commits

Author SHA1 Message Date
Albrecht Schlosser
7c3489061e Fix several compiler warnings 2023-12-04 17:40:31 +01:00
Albrecht Schlosser
52a853c39c Backport CMake and related stuff from 1.4 (master)
- update formatting + documentation generation
- rename help-test.html to help_dialog.html
- update CMake files + Makefiles + related source files
- update fluid files + dependencies
2021-04-08 14:57:40 +02:00
Albrecht Schlosser
02e4b8f980 Bump version numbers to 1.3.6 (prepare release part 1) 2021-02-04 14:58:30 +01:00
Manolo Gouy
9dfa8a92a9 Fix macOS 10.14 Mojave support of the FLTK-cairo interface.
After experimenting with a modified cairo_test program that draws both with
 cairo and with regular FLTK drawing functions to the same window, it seems
 necessary to control for possible changes to the graphics context made by
 cairo in Fl_Window::make_current() rather than in
 cairo_create_surface().

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@13120 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-11-09 14:46:49 +00:00
Manolo Gouy
2eea5d5856 Support of macOS 10.14 Mojave: better implementation of the Cairo-FLTK interface.
This implementation puts all code related to Cairo support under Mojave in 
the Cairo-specific source file cairo/Fl_Cairo.cxx, which is preferable.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@13116 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-11-08 17:23:27 +00:00
Manolo Gouy
63626c8f26 Cairo support under macOS 10.14 Mojave: slightly simpler implementation
This post http://www.fltk.org/newsgroups.php?s36927+gfltk.general+v36944
reports a full-size Cairo-using FLTK app to be OK under Mojave with the
equivalent of this fix for the 1.4 branch.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@13114 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-11-08 13:14:37 +00:00
Manolo Gouy
6467a4ada0 MacOS: fix support of Cairo under macOS 10.14 Mojave.
The cairo_test program would redraw the window vertically flipped after the window was
hidden or miniaturized when layer-backed windows were used.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@13111 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-11-05 09:04:38 +00:00
Manolo Gouy
0c303164ba Mac OS platform: Remove old Carbon code from cairo/Fl_Cairo.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-09-26 09:22:55 +00:00
Albrecht Schlosser
0462cae6d1 [Cairo] Remove part of the dependency of FL/Fl.H on config.h.
To use Fl_Cairo_Window one ddi not only need to configure with --enable-cairo,
but also needed to #include <config.h> before #include <FL/Fl.H>.

This commit removes the smaller part of the dependency of the public header
file FL/Fl.H on config.h. This needs a better solution in FLTK 1.4.0.

The user still needs to define FLTK_HAVE_CAIRO _before_ #include <FL/Fl.H>.

Note: This is not compatible with fluid, since fluid _always_ includes
FL/Fl.H as the first statement in generated header files.

See also the discussion in fltk.general:

https://groups.google.com/d/msg/fltkgeneral/_C1OJhMLQl0/pHUFtz9SCwAJ



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11167 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-13 17:35:36 +00:00
Albrecht Schlosser
797e4d60cc Fix undefined reference building shared cairo library (STR #3276).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11005 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-16 01:48:04 +00:00
Albrecht Schlosser
f41be78153 Rename confusing configure and Makefile (makeinclude) variable.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10653 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-25 20:06:54 +00:00
Albrecht Schlosser
1a69ba5ae9 Update configure and makeinclude.in to get rid of version numbers in Makefiles.
configure is used to set all needed version numbers in makeinclude.
makeinclude is included in Makefile's and the version numbers are used
to build the correct shared libs.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10609 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-07 18:37:56 +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
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
Fabien Costantini
8edcf8f29f STR#3012 Fix: cairo_make_current(void*, int, int) would not release previously allocated cc in certain conditions, fixed the extra cc non null test condition erronously formulated in previous submission.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10027 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-12-11 06:33:14 +00:00
Fabien Costantini
32aba335c6 STR#3012 Fix: cairo_make_current(void*, int, int) would not release previously allocated cc in certain conditions.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-12-11 06:16:57 +00:00
Albrecht Schlosser
61923a5bf8 Update even more version numbers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9830 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-03-01 00:40:53 +00:00
Manolo Gouy
0130df031a Allows compilation on 64-bit Mac OS X with FLTK_HAVE_CAIRO defined.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9250 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-02-21 12:27:31 +00:00
Greg Ercolano
4f4a8fc3c7 Modifications to all LGPL headers for STR #2685.
(to clarify static exception LGPL by changing license references)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-07-19 04:49:30 +00:00
Manolo Gouy
cff882f34d Fix STR #2585: use relative link when installing the cairo shared library.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8510 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-03-06 16:37:22 +00:00
Manolo Gouy
22111debb8 Fixed use of FLTK_HAVE_CAIRO under Mac OS.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8201 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-06 13:17:21 +00:00
Manolo Gouy
bc509d32eb Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO and USE_CAIRO
by FLTK_USE_CAIRO everywhere.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-06 10:24:58 +00:00
Greg Ercolano
4327734e69 More copyright 2010 mods.
Used: vi `grep -r 'Copyright .*Spitzak' . | grep -v 2010 | grep -v '/\.svn' | cut -d: -f1`


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7913 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-29 18:18:27 +00:00
Greg Ercolano
4fd11eba88 Changed references to fltk-bugs@fltk.org -> STR form.
Todo: LGPL license file references (COPYING, license.dox, etc)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-28 03:15:47 +00:00
Albrecht Schlosser
a0d26b634a Mostly rewritten CMake files by Michael Surette. They are more complete
than what we had previously, but may need some more testing. The latest
changes (removing old APPLE_QD definitions and code) might need another
update.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7451 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-05 22:33:58 +00:00
Albrecht Schlosser
6fe1ac09f4 makedepend updates for all source directories (except src/xutf8).
src/Makefile:	adjusted WIN32 and Mac dependencies
test/Makefile:	dto.

Todo: src/xutf8/makedepend needs to be checked. There are obviously functions
and headers that are included in a platform dependent way.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7032 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-01-27 20:16:38 +00:00
yuri
d474e13b03 fix --enable-cairoext in configure
fix shared library cairo build (shared library name under Linux)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6647 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-01-27 22:34:46 +00:00
Fabien Costantini
a33d0a6d29 STR#2035 fix : Changed all 1998-200[0-8] dates to 1998-2009 for supported fltk files (this excludes i.e the png subdir).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6626 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-01-12 14:52:45 +00:00
Matthias Melcher
167d767e0f Changed the copyright to 2009 for header files. Still todo: src and test directory.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6614 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-01-01 16:11:32 +00:00
Fabien Costantini
0c69cbc7a0 Fixed cairo dso lib would not be generated automatically, missing one dep in darwin dso gen, missing make depend target.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6486 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-10-25 20:40:20 +00:00
Fabien Costantini
ed6ac69dd6 Fixed cairo makefiles link error when shared option activated under linux.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6485 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-10-25 18:31:44 +00:00
Fabien Costantini
268ffc6ef2 Cairo increment 2: Finer cairo granularity, less deps, new fltk_cairo lib
+ added new USE_CAIRO config preprocessor def. 
   to differentiate from HAVE_CAIRO so that we can use the cairo lib 
   without forcing the full fltk lib to be linked against it.
   In that case, cairo autolink context functionality which needs fltk lib 
   instrumentation is disabled.
 + added new --enable-cairoext, which correspond to previous --enable-cairo.
   now, --enable-cairo only adds HAVE_CAIRO def. and keeps fltk lib
   from referencing cairo.
   In both cases (--enable-cairo & --enable-cairoext), a new fltk_cairo lib is 
   created. This lib, similarly to local versions of png,jpeg and zlib, 
   is not generated if cairo is not enabled.
 + added cairo to fltk-config : now new --use-cairo flag is available
 + modified all unix like makefiles to now generate minimum cairo deps and also
   new libfltk_cairo lib.
 + added new cairo subdir to permit conditional fltk_cairo lib generation. 
 + vc2005 project minimum update to compile without be broken, but still needs
   to create a similar fltk_cairo independent lib. For now, it works as before
   with a dedicated cairo env. similar to --enable-cairoext context in unix.
 + regression tested ok with cairo disabled on win32, mac osx, mingw.
  


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6462 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-10-19 01:42:35 +00:00