6 files changed, 33 insertions, 22 deletions
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index be9b016cc..b517be2c3 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -81,9 +81,9 @@ void Fl_Double_Window::flush() {flush(0);}
 void Fl_Double_Window::flush(int eraseoverlay) {
   if (!shown()) return;
   make_current(); // make sure fl_gc is non-zero
-  Fl_Window_Driver *myi = (Fl_Window_Driver*)Fl_X::i(this);
+  Fl_X *myi = Fl_X::i(this);
   if (!myi) return; // window not yet created
-  int retval = myi->double_flush(eraseoverlay);
+  int retval = driver()->double_flush(eraseoverlay);
   if (retval) return;
   if (eraseoverlay) fl_clip_region(0);
   // on Irix (at least) it is faster to reduce the area copied to
@@ -102,13 +102,15 @@ int Fl_Window_Driver::double_flush(int eraseoverlay) {
    Fl_Overlay_Window's which fall back on this implementation.
    - on Xlib, it is reimplemented if the Xdbe extension is available.
    */
-  if (!other_xid) {
-    other_xid = fl_create_offscreen(w->w(), w->h());
-    w->clear_damage(FL_DAMAGE_ALL);
+  Fl_X *i = Fl_X::i(pWindow);
+
+  if (!i->other_xid) {
+    i->other_xid = fl_create_offscreen(pWindow->w(), pWindow->h());
+    pWindow->clear_damage(FL_DAMAGE_ALL);
   }
-  if (w->damage() & ~FL_DAMAGE_EXPOSE) {
-    fl_clip_region(region); region = 0;
-    fl_begin_offscreen(other_xid);
+  if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
+    fl_clip_region(i->region); i->region = 0;
+    fl_begin_offscreen(i->other_xid);
     fl_graphics_driver->clip_region( 0 );
     draw();
     fl_end_offscreen();
@@ -120,26 +122,27 @@ void Fl_Double_Window::resize(int X,int Y,int W,int H) {
   int ow = w();
   int oh = h();
   Fl_Window::resize(X,Y,W,H);
-  Fl_Window_Driver *myi = (Fl_Window_Driver*)Fl_X::i(this);
+  Fl_X *myi = Fl_X::i(this);
   if (myi && myi->other_xid && (ow < w() || oh < h()))
-    myi->destroy_double_buffer();
+    driver()->destroy_double_buffer();
 }
 
 void Fl_Double_Window::hide() {
-  Fl_Window_Driver *myi = (Fl_Window_Driver*)Fl_X::i(this);
+  Fl_X *myi = Fl_X::i(this);
   if (myi && myi->other_xid) {
-    myi->destroy_double_buffer();
+    driver()->destroy_double_buffer();
   }
   Fl_Window::hide();
 }
 
 void Fl_Window_Driver::destroy_double_buffer() {
+  Fl_X *i = Fl_X::i(pWindow);
   /* This is a working, platform-independent implementation.
    Some platforms may re-implement it for their own logic:
    - on Xlib, it is reimplemented if the Xdbe extension is available.
    */
-  fl_delete_offscreen(other_xid);
-  other_xid = 0;
+  fl_delete_offscreen(i->other_xid);
+  i->other_xid = 0;
 }
 
 
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 54d6e9cc2..c3cb7f498 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -64,17 +64,21 @@ void Fl_Window::_Fl_Window() {
   callback((Fl_Callback*)default_callback);
 }
 
-Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l)
-: Fl_Group(X, Y, W, H, l) {
+Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l) :
+Fl_Group(X, Y, W, H, l),
+pWindowDriver(Fl_Window_Driver::newWindowDriver(this))
+{
   cursor_default = FL_CURSOR_DEFAULT;
 
   _Fl_Window();
   set_flag(FORCE_POSITION);
 }
 
-Fl_Window::Fl_Window(int W, int H, const char *l)
+Fl_Window::Fl_Window(int W, int H, const char *l) :
 // fix common user error of a missing end() with current(0):
-  : Fl_Group((Fl_Group::current(0),0), 0, W, H, l) {
+Fl_Group((Fl_Group::current(0),0), 0, W, H, l),
+pWindowDriver(Fl_Window_Driver::newWindowDriver(this))
+{
   cursor_default = FL_CURSOR_DEFAULT;
 
   _Fl_Window();
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx
index 22517bfc7..37ce9637f 100644
--- a/src/Fl_Window_Driver.cxx
+++ b/src/Fl_Window_Driver.cxx
@@ -24,7 +24,8 @@
 #include <FL/Fl.H>
 
 
-Fl_Window_Driver::Fl_Window_Driver(Fl_Window *win)
+Fl_Window_Driver::Fl_Window_Driver(Fl_Window *win) :
+pWindow(win)
 {
 }
 
@@ -33,6 +34,9 @@ Fl_Window_Driver::~Fl_Window_Driver()
 {
 }
 
+void Fl_Window_Driver::draw() {
+  pWindow->draw();
+}
 
 //
 // End of "$Id$".
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 2da202e7e..42e85fd69 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2945,7 +2945,7 @@ void Fl_X::make(Fl_Window* w)
       yp -= by+bt;
     }
   
-    Fl_Window_Driver *x = Fl_Window_Driver::newWindowDriver(w);
+    Fl_X *x = new Fl_X;
     x->other_xid = 0; // room for doublebuffering image map. On OS X this is only used by overlay windows
     x->region = 0;
     x->subRect(0);
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;