From 12eef8e64d2518c140770529ce6e03f046b33ecf Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 7 Mar 2016 21:15:25 +0000 Subject: 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 --- FL/Fl_Window.H | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'FL/Fl_Window.H') diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 9dd443e8e..659495f32 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -71,7 +71,8 @@ class FL_EXPORT Fl_Window : public Fl_Group { friend class Fl_X; friend class Fl_Window_Driver; - Fl_Window_Driver *i; // points at the system-specific stuff + Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped + Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creatino time struct icon_data { const void *legacy_icon; @@ -635,7 +636,7 @@ public: // Captures the titlebar and borders of the window, if they exist. void capture_titlebar_and_borders(Fl_Shared_Image*& top, Fl_Shared_Image*& left, Fl_Shared_Image*& bottom, Fl_Shared_Image*& right); - Fl_Window_Driver *driver() { return i; } + Fl_Window_Driver *driver() { return pWindowDriver; } /** Return non-null if this is an Fl_Overlay_Window object. -- cgit v1.2.3