Commit Graph

156 Commits

Author SHA1 Message Date
Albrecht Schlosser
bbbb477581 Prepare src/Makefile to compile Xlib driver files.
We need something simple to decide which files to include in the
compilation. Maybe configure should write some of the well-known
variables like USE_X11 and USE_XFT into the 'makeinclude' file.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11070 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:21:34 +00:00
Matthias Melcher
411e73fe24 Messed up Makefiles in order to compile on OS X with carved out Graphics Driver
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11066 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 22:59:58 +00:00
Matthias Melcher
b1e15d245a Further fudged up the Makefile dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11061 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-26 22:26:57 +00:00
Matthias Melcher
222538baad Hacky version of font_x and font_xft, compiles on Fedora Linux
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11054 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-26 20:31:43 +00:00
Matthias Melcher
12e85b882a Fixed for Linux
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-24 21:06:21 +00:00
Matthias Melcher
21ae726ba4 Fixes for Unix/X11
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11046 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-24 16:34:59 +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
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
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
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
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
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
Lauri Kasanen
c4b6455d32 Newer linkers are more strict about libs coming after objects.
This is also consistent with the Mac and Windows platforms in the same file.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10241 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-08-21 14:24:19 +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
Fabien Costantini
54b0123eab Added a new portable sleep API(ABI compatible). Now features a flexible multi-usage sleep() api accepting decimals, msleep() for millisecs only, usleep() for microsecs. Updated Makefiles, cmakefiles, vs2008, vs2010 with the new Fl_sleep add-on. Documented new API. still needs to be added in Xcode.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10150 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-21 04:10:12 +00:00
Greg Ercolano
c5d5ba1cf5 Applying the etorres gleam patch. STR #2672.
TODO: Xcode 4 ide needs fl_gleam.cxx added
      Test of Visual Studio IDE mods (which were hand-modified)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-02-25 04:24:41 +00:00
Manolo Gouy
6b69461ea9 Renamed src/Fl_Sys_Menu_Bar.cxx to src/Fl_Sys_Menu_Bar.mm because objective-c code is used.
Some code is transferred from Fl_cocoa.mm thus reducing somewhat this very large source file.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9885 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-04-16 14:02:42 +00:00
Albrecht Schlosser
618eb31b20 Update version number in src/Makefile (STR #2932).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9829 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-02-28 23:16:27 +00:00
Matthias Melcher
8701434312 Upgrade version number to 1.3.1
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9707 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-11-06 21:13:54 +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
1e26d2db61 Removed uses of Fl_Native_File_Chooser_{MAC,WIN32}.H that no longer exist.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8389 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-06 14:08:08 +00:00
Manolo Gouy
a8530c73fa Adopted use of FL_LIBRARY #define symbol under Mac OS X. This allows to compile
client applications without including Mac OS system headers, with a gain in speed of 
compilation and portability. The source files of all FLTK libraries must now be compiled with 
-DFL_LIBRARY under Mac OS X. Make, CMake and Xcode project support files
have been modified accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-23 14:24:29 +00:00
Manolo Gouy
58445e7f9a Removed reference to deleted file fl_dnd_mac.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8057 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-18 22:39:24 +00:00
Manolo Gouy
b211421bc4 Removed [] expression.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-17 15:06:25 +00:00
Manolo Gouy
f3c7efc8d2 The 3 objective-c++ files used for the Mac OS X support are no longer included
by other files but added to the list of source files to be compiled
for Mac OS X only. Support files for autoconf/configure/make, CMake and Xcode
are also modified accordingly.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-17 10:43:41 +00:00
Manolo Gouy
56f967b001 Change needed after rename of Fl_Native_File_Chooser_MAC.cxx
to Fl_Native_File_Chooser_MAC.mm


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-16 07:26:56 +00:00
Matthias Melcher
a803cec1b7 Fixed even more Copyright to 2010. Probably still forgot some.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7906 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-28 21:28:30 +00:00
Manolo Gouy
6fb99e7ec7 Reflecting change in device hierarchy.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7618 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-05-27 17:24:21 +00:00
Manolo Gouy
5591315e17 Updating dependencies
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7333 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-25 14:35:45 +00:00
Manolo Gouy
7d7b276ae7 Reflecting rename of src/Fl_Gl_Printer.cxx to src/Fl_Gl_Device_Plugin.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7288 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-17 14:40:31 +00:00
Albrecht Schlosser
efed27b2c4 fixed src/Makefile and updated dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7287 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-17 14:19:34 +00:00
Albrecht Schlosser
998cc6df52 Merge of branch-1.3-Fl_Printer, with the following main changes:
(1) adding Fl_Device class (and more) for device abstraction
 (2) adding Fl_Pinter class (and more) for printing support.

Todo: Code cleanup, update dependencies, remove/replace test print window.
I'm looking into converting the test window popup in a global shortcut
that would pop up the print dialog now...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7263 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-14 18:07:24 +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
Greg Ercolano
1de0988c31 Added Fl_Native_File_Chooser widget (with manolo's cocoa mods) to FLTK.
* Source brought into CMP standards compliance
	* test program added (test/native-filechooser.cxx)
	* Tested with linux (Ubuntu8) and with OSX (cocoa and non-cocoa builds)

TODO:
	* Needs doxygen docs from Greg's original HTML documentation
	* Needs mods to Windows build files
	* Needs mods to cmake, and other build files
	* Needs Manolo's latest mods (from STR #2298) mentioned on and after "02:05 Jan 13, 2010"



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6997 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-01-13 23:13:59 +00:00
Matthias Melcher
c8278a2344 New patches appliet for Cocoa port. Fixed(?) STR 2232 workaround for X11 keyrepeat bbbbuuuuuuggggg.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6966 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-12-13 12:03:26 +00:00
Matthias Melcher
07a18370ad Added Fl_Tree source code, demo files, and documentation. Thanks, Greg!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6934 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-11-14 15:49:12 +00:00
Matthias Melcher
fefa82e0b1 Adding Gerg's Fl_Table widget to FLTK 1.3 with kind permission. Documentation not yet added Support for both Visual Studio IDE's not yet added.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6929 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-11-14 13:05:37 +00:00
Albrecht Schlosser
c0717aa18e STR 2147: new configure option --enable-x11 for building on cygwin with X11
support. 


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6657 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-02-14 14:34:32 +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
Matthias Melcher
6b3f61e3ff In the configuration setp, LIBNAME (which contains the local path of the library as seen from the src directory) was used wrong. I added LIBBASENAME, the true library name without the path, and replaced LIBNAME wherever it was used wrongly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-12-29 19:45:46 +00:00
Albrecht Schlosser
a26fe4d320 Re-applying change to Makefile reverted by Fabien (STR 2063).
Although this may look strange for somebody, it is the correct fix for
the _current_ Makefile implementation, as discussed in fltk.development.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6496 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-11-04 08:16:50 +00:00
Fabien Costantini
28553f266f Reverted las Makefile changes. This is not acceptable because any modification tyo xutf8 file must be achieved in corresponding xutf Makefile. So Instead of cleaning the file generated by xutf Makefile by src makefile, you have to do that in the xutf8 Makefile instead.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6494 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-11-02 11:25:51 +00:00
Albrecht Schlosser
962f924d04 make clean (and make distclean) now delete src/xutf/*.o
STR #2063


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6493 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-11-01 17:33:38 +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
Fabien Costantini
ffad932289 + Cairo branch merged after successful testing on Mac OS X 10.5.4, Linux Ubuntu 8.04,Windows XPSP2.
This integration is minimum as discussed, in particular it does not feature any fltk cairo drawing substitution
  as in fltk2.
  Still it provides all the fundations to go further even in next 1.4 ... 
  By default *no* cairo features are implemented nor linked, it can only be activated by --enable-cairo
  whose default is false.
  Please visit the README.cairo for complete description.

+ fixed UTF8 compilation pb on linux ubuntu

+ minor comments fixes on the fly



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-25 18:26:33 +00:00
Matthias Melcher
b6bde2e456 Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-10 23:56:49 +00:00
Matthias Melcher
433dec6b92 Changed Makefile in src to use 1.3 instead of 1.1 (STR #1922). Fixed minor issue with handling of shortcuts in text input fields.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6115 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-04-23 20:08:39 +00:00
Matthias Melcher
8038713b19 Fixed library path in Makefile (STR #1885)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6057 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-02-27 15:00:31 +00:00
Michael R Sweet
1dd28f6e4b Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5689 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2007-02-10 14:31:12 +00:00