6 files changed, 46 insertions, 6 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index e18d4aa82..06ab4f79d 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -21,6 +21,19 @@
 #include "Fl_Cocoa_Window_Driver.h"
 
 
+Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *w)
+{
+  return new Fl_Cocoa_Window_Driver(w);
+}
+
+
+Fl_Cocoa_Window_Driver::Fl_Cocoa_Window_Driver(Fl_Window *win)
+: Fl_Window_Driver(win)
+{
+}
+
+
+
 //
 // End of "$Id$".
 //
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.h b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.h
index 67d4f3d5a..b507e2ec4 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.h
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.h
@@ -25,7 +25,7 @@
 #ifndef FL_COCOA_WINDOW_DRIVER_H
 #define FL_COCOA_WINDOW_DRIVER_H
 
-#include <FL/x.H>
+#include <FL/Fl_Window_Driver.H>
 
 /*
  Move everything here that manages the native window interface.
@@ -42,9 +42,10 @@
  ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx?
  */
 
-class FL_EXPORT Fl_Cocoa_Window_Driver : public Fl_X
+class FL_EXPORT Fl_Cocoa_Window_Driver : public Fl_Window_Driver
 {
 public:
+  Fl_Cocoa_Window_Driver(Fl_Window*);
 };
 
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index f9897619a..b11b0ee00 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -21,6 +21,18 @@
 #include "Fl_WinAPI_Window_Driver.h"
 
 
+Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *w)
+{
+  return new Fl_WinAPI_Window_Driver(w);
+}
+
+
+Fl_WinAPI_Window_Driver::Fl_WinAPI_Window_Driver(Fl_Window *win)
+: Fl_Window_Driver(win)
+{
+}
+
+
 //
 // End of "$Id$".
 //
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.h b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.h
index df4f6b7ef..6e4113ef1 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.h
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.h
@@ -25,7 +25,7 @@
 #ifndef FL_WINAPI_WINDOW_DRIVER_H
 #define FL_WINAPI_WINDOW_DRIVER_H
 
-#include <FL/x.H>
+#include <FL/Fl_Window_Driver.H>
 
 /*
  Move everything here that manages the native window interface.
@@ -42,9 +42,10 @@
  ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx?
  */
 
-class FL_EXPORT Fl_WinAPI_Window_Driver : public Fl_X
+class FL_EXPORT Fl_WinAPI_Window_Driver : public Fl_Window_Driver
 {
 public:
+  Fl_WinAPI_Window_Driver(Fl_Window*);
 };
 
 
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index f02d92ed8..ccdcfcb5f 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -21,6 +21,18 @@
 #include "Fl_X11_Window_Driver.h"
 
 
+Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *w)
+{
+  return new Fl_X11_Window_Driver(w);
+}
+
+
+Fl_X11_Window_Driver::Fl_X11_Window_Driver(Fl_Window *win)
+: Fl_Window_Driver(win)
+{
+}
+
+
 //
 // End of "$Id$".
 //
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.h b/src/drivers/X11/Fl_X11_Window_Driver.h
index 1c1da8391..b391ab5a1 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.h
+++ b/src/drivers/X11/Fl_X11_Window_Driver.h
@@ -25,7 +25,7 @@
 #ifndef FL_X11_WINDOW_DRIVER_H
 #define FL_X11_WINDOW_DRIVER_H
 
-#include <FL/x.H>
+#include <FL/Fl_Window_Driver.H>
 
 /*
  Move everything here that manages the native window interface.
@@ -42,9 +42,10 @@
  ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx?
  */
 
-class FL_EXPORT Fl_X11_Window_Driver : public Fl_X
+class FL_EXPORT Fl_X11_Window_Driver : public Fl_Window_Driver
 {
 public:
+  Fl_X11_Window_Driver(Fl_Window*);
 };