diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-02-17 12:16:59 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-02-17 12:16:59 +0000 |
| commit | 4a1662f1da8c57a446c8f19f0204c0048f2e1ba3 (patch) | |
| tree | c9a1ed67711ab0e01c4d200a507afe20a4416982 /src/Fl.cxx | |
| parent | f7ef143c4f3e770fd8126389e628642c31efa62f (diff) | |
Fix compilation under Linux - compiles, but doesn't work :-(
I moved all timer related (X11) stuff from src/Fl.cxx to
src/drivers/X11/Fl_X11_Screen_Driver.cxx and added externals as
done by Ian in a previous commit for the WinAPI screen driver.
I did not (yet) remove the code from Fl_x.cxx though, but disabled it. See:
#if (0) // *FIXME* moved to src/drivers/X11/Fl_X11_Screen_Driver.cxx
Current state is that FLTK can be compiled and linked again (under Linux)
but doesn't work (shows empty windows only).
I thought it was worth to commit my work, but can't check what's going on
right now - other devs should feel free to continue this.
PS: the new code in src/drivers/X11/Fl_X11_Screen_Driver.cxx was just
dropped in, keeping the right order for usage of static helper functions,
but should be fixed in all regards (order, logic, ...).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11185 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
| -rw-r--r-- | src/Fl.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 329839b3a..7f7e2076c 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -355,6 +355,7 @@ int Fl::event_inside(const Fl_Widget *o) /*const*/ { // X11 timers // +#if (0) // *FIXME* moved to src/drivers/X11/Fl_X11_Screen_Driver.cxx //////////////////////////////////////////////////////////////////////// // Timeouts are stored in a sorted list (*first_timeout), so only the @@ -451,6 +452,8 @@ void Fl::remove_timeout(Fl_Timeout_Handler cb, void *argp) { } } +#endif // *FIXME* moved to src/drivers/X11/Fl_X11_Screen_Driver.cxx + #endif //////////////////////////////////////////////////////////////// |