Commit Graph

6622 Commits

Author SHA1 Message Date
Albrecht Schlosser
2ddf594bc3 Document configuration of ABI version, prepare CHANGES for 1.4.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11115 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-02 02:59:32 +00:00
Albrecht Schlosser
604dd63b45 [CMake] Document usage of .fl files w/o fltk_wrap_ui (STR #3281).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-02 00:49:51 +00:00
Matthias Melcher
6f49c3e419 Clean up fl_args for OS X.
Xcode and OS X have the annoying habit of adding the process number and debug information on the command line if an an app is inside a bundle. This is a little cleanup that I thought was useful while going through the code. A better solution would be to remove those system specific arguments from the argc/argv list entirely, as they appear totally unexpected for most developers.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11111 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 23:39:07 +00:00
Matthias Melcher
6e16d033ae Add fl_focus_rect function to driver.
Focus rectangles are dotted lines. The default implementation uses the dotted line style, However, for systems without line stye, we draw many dots instead.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11110 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 23:06:14 +00:00
Manolo Gouy
5af1344b80 Added missing class name in member function implementation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11109 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 17:29:02 +00:00
Manolo Gouy
6547214755 Transmit to branch 1.3-porting a recent change committed in branch 1.3
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11108 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 17:27:59 +00:00
Manolo Gouy
6f799cb648 Fix shapedwindow test program.
same commit as in 1.3 branch

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11107 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 14:24:24 +00:00
Manolo Gouy
2b36a14d10 Fix Mac OS "Print front window" of the application menu.
This is part of r.10990 committed to the 1.3 branch, still to be replicated
in this branch.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11105 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 09:14:08 +00:00
Manolo Gouy
6c5fa18433 Remove fl_set_fonts_mac.cxx and put in Fl_Quartz_Graphics_Driver_font.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11104 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-01 06:46:23 +00:00
Matthias Melcher
5638a5f471 Just cleaning up a few lines.
Removed a false comment I just added. 
Removed FL_PORTING ifdef that is no longer needed

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11103 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 21:47:25 +00:00
Albrecht Schlosser
86abe14361 Fix undefined reference building shared cairo library (STR #3276).
Ported from branch-1.3, svn r 11005.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11102 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 18:20:09 +00:00
Matthias Melcher
b9c8042a6a Fixed WIN32 setup. X11 setup verified.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11101 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 14:05:19 +00:00
Matthias Melcher
7440ea209a Moved fl_create_bitmask and fl_delete_bitmask functions into driver structure. Tested on OS X.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11100 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 13:51:01 +00:00
Manolo Gouy
caf2a7e92c Have all test programs buildable with ide/Xcode4 project.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11099 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 12:04:43 +00:00
Manolo Gouy
f93fd54a7c Needed for Linux/Unix build.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11098 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 11:47:49 +00:00
Albrecht Schlosser
0a6be0a83f Fix compiler warnings (STR 2988), porting from branch-1.3.
This commit is the accumulated patch introduced in branch 1.3
in svn r 11094, 11095, and 11096.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 04:33:54 +00:00
Albrecht Schlosser
642187dc1c Finish removing of #include of driver files, remove FL_LIBRARY_CMAKE.
Now all graphics drivers are compiled as individual files depending
on the platform and configuration. The preprocessor macro FL_LIBRARY_CMAKE
is now obsolete and has been removed.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11093 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 01:14:50 +00:00
Albrecht Schlosser
5c32d3b24c Update build system to compile all drivers as indiviual objects.
Removed obsolete files that served only one purpose: to #include
different driver files. Updated CMake and Makefiles to reflect the
changes. Build tested with:
 - MinGW + configure/make
 - MinGW + CMake/make
 - Visual Studio 2010 generated by CMake


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 00:39:57 +00:00
Albrecht Schlosser
6cc67c18f2 Reflect changes in new Windows IDE (Debug Mode).
Windows executables in Debug mode don't have the trailing 'd'
they used to have with the old (bundled) IDE files.
The removal of 'd' (e.g. from askd.exe) was removed.

Also prepared test/CMakeLists.txt for a better installation
path of test files (copied from the source directory).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11090 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 21:00:12 +00:00
Albrecht Schlosser
e9395133e3 Fix Windows compilation error in Fl_Native_File_Chooser_WIN32.cxx.
Fix regression (typo) introduced in svn r11086.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11089 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 01:20:40 +00:00
Albrecht Schlosser
00dd296ff2 Bump version numbers for next minor release: FLTK 1.4.0.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11088 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 00:56:42 +00:00
Albrecht Schlosser
39c943ac8f Fix case of include file names.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11087 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 00:52:28 +00:00
Matthias Melcher
40e9ae6e61 Fixed a few warnings from a picky compiler setting.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11086 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 20:50:04 +00:00
Matthias Melcher
8717f1b252 A bit more OpenGL cleanup
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11085 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 15:59:11 +00:00
Matthias Melcher
f5a6b10f46 Updated OpenGL Display Device
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11084 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 15:56:29 +00:00
Matthias Melcher
222243bc86 Made OpenGL driver compile by itself instead of including files from another .cxx file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11083 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 15:24:33 +00:00
Albrecht Schlosser
72dda7f35a CMake] Work around CMake bug in CMake versions 3.4.x.
CMake versions 3.4.x crash when using fltk_wrap_ui, a built-in CMake
command. According to the CMake devs this will be fixed in CMake 3.5.

However, since fltk_wrap_ui is no longer necessary (it can replaced by
custom build commands) and some Linux distributions deploy CMake 3.4.x
we decided to use an own replacement function.

This makes sure that FLTK can be built with CMake 3.4.x, but FLTK users
may still have to rewrite their own CMake files to not use fltk_wrap_ui.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11082 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 13:40:08 +00:00
Albrecht Schlosser
6b8570c72c Update Makefile to compile only needed Xlib driver files.
Commented out #include statements of Xlib driver files.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11080 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 01:05:18 +00:00
Albrecht Schlosser
7728bf91e6 Prepare build configuration variables in Makefiles.
Introduce new Makefile variables BUILD_xxx in makeinclude file, generated
by configure. These variables may be used to select files to be compiled,
dependent on the build configuration.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11079 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 23:57:50 +00:00
Ian MacArthur
3b48b22a71 Fix (probably correct!) for compiling Fl_Window::capture_titlebar_and_borders() on WIN32 hosts.
This allows compilation to complete, and appears to work. Probably.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11078 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 17:38:11 +00:00
Manolo Gouy
d3675ae058 Removed compilation warning.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11077 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 17:37:59 +00:00
Ian MacArthur
5aefd057d1 Non-changing changes... Attempting to keep the porting branch somehwat in-sync with doc changes in main 1.3.x
None of these changes alter the actual code.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11076 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 17:16:32 +00:00
Manolo Gouy
ed9ac2aba3 Removed extra }
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11075 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 11:54:08 +00:00
Manolo Gouy
1c3c544edf Added Fl_Window::capture_titlebar_and_borders a new private member function
that triggers a warning when FL_PORTING is ON and with a default platform-neutral
implementation.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11074 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 11:51:07 +00:00
Ian MacArthur
e2cc1a80f0 Some trivial adjustments to support building
under Win32/mingw with the configure/make
on Win7 with Msys.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 11:18:01 +00:00
Albrecht Schlosser
74aa645d8f Fix silly copy-and-change error.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11072 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:48:42 +00:00
Albrecht Schlosser
6d72d430e4 (Try to) fix CMake for Apple, prepare for Windows drivers.
This update is tested on Linux only, but should hopefully work on
Mac OS X with CMake + make and/or CMake + Xcode.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11071 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:31:59 +00:00
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
Albrecht Schlosser
9a376a61da Fix duplicate of FLTK colormap: fl_cmap[] is now global.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11069 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:06:23 +00:00
Albrecht Schlosser
db9befe6cf Fix Linux - remove duplicates introduced by merge conflicts.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11068 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:02:51 +00:00
Albrecht Schlosser
48db7a07ef Modify Xlib driver code not to #include source files.
Adjusted CMake build, and with some additional temporary #ifdef's
the old Linux Makefile system works as well.

Defined FL_LIBRARY_CMAKE for now - will be removed later.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11067 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 23:57:53 +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
780f43a4f1 Removed all references to Quartz driver files from library headers in Xcode. Works in Xcode.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11065 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 22:35:58 +00:00
Manolo Gouy
6177c23d90 Further things related to the r11063 commit.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 18:24:25 +00:00
Manolo Gouy
8e3f66073f 1) Added a new way to detect whether the drawing operation is using the platform's native driver
and whether we are printing:  virtual int Fl_Graphics_Driver::has_feature(driver_feature feature)
This is also because it is not convenient to derive a printer-specific driver with its own
implementation of virtual functions when this implementation differs only in one line of code.

2) Solved the problem of inclusion of non public header by the public header FL/Fl_Device.H:
bracket this with #if FL_LIBRARY / #endif so this non public header is included only when building
FLTK itself.

3) Removed several (but not all) of the FLTK_ABI_VERSION guards that are no longer
useful for code targeting FLTK 1.4.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11063 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 18:11:20 +00:00
Matthias Melcher
1c4661c481 Fixed a few comments
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11062 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-26 22:39:47 +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
87e29cef82 Moving image drawing code into the driver system
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11060 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-26 22:20:15 +00:00
Matthias Melcher
034a4f3f2a Made GDI compilation work again
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11059 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-26 21:31:59 +00:00
Matthias Melcher
6694780c2d Moving GDI/WIN32 files to new directroy structure
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11058 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-26 21:10:49 +00:00