diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-03-07 21:15:25 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-03-07 21:15:25 +0000 |
| commit | 12eef8e64d2518c140770529ce6e03f046b33ecf (patch) | |
| tree | 7c71d0d214f396e1daf3e14424293f3aea93cf59 /src/drivers | |
| parent | b6b99d84e9513405ee381dbf93572914d195fc75 (diff) | |
Separating Fl_X and Fl_Window_Driver in Fl_Window.
This was needed because Fl_X only exists if a window is mapped, but we need the driver from the very beginning. Adding Fl_X in the ctor would create hidden bugs. Strategy is now to remove system specific stuff from Fl_X and move it one-by-one to Fl_Window_Driver while maintaining a working code base. X11 and WIN32 fixups will follow in 15 minutes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11308 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index 685aebbd3..5783187d6 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -52,7 +52,7 @@ extern Fl_Window *fl_xfocus; void Fl_Cocoa_Window_Driver::take_focus() { - set_key_window(); + Fl_X::i(pWindow)->set_key_window(); } // diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx index 671ee7b6d..cf25d1091 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx @@ -124,7 +124,7 @@ Fl_X* Fl_X::make(Fl_Window *w) } else { parent = 0; } - Fl_Window_Driver *x = Fl_Window_Driver::newWindowDriver(w); + Fl_X *x = new Fl_X; x->other_xid = 0; x->w = w; x->region = 0; |