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_Driver.H | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'FL/Fl_Window_Driver.H') diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index 540b6971f..9f938606f 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -33,7 +33,9 @@ class Fl_Window; /** \brief A base class for platform specific window handling code. */ -class FL_EXPORT Fl_Window_Driver : public Fl_X { +class FL_EXPORT Fl_Window_Driver { +protected: + Fl_Window *pWindow; public: Fl_Window_Driver(Fl_Window *); virtual ~Fl_Window_Driver(); @@ -42,7 +44,7 @@ public: virtual void take_focus() { } virtual int double_flush(int eraseoverlay); virtual void destroy_double_buffer(); - void draw() {w->draw();} + void draw(); }; -- cgit v1.2.3