Quick fix for Fluid on X11. MSWindows version broken due to missing Fl_Printer::Helper::Helper

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11357 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 12 insertions, 18 deletions

diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 8edb316b8..49e890e22 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -32,7 +32,7 @@
 
 
 Fl_Double_Window::Fl_Double_Window(int W, int H, const char *l)
-: Fl_Window(0, 0, W, H, l, Fl_Window_Driver::newWindowDriver(this))
+: Fl_Window(0, 0, W, H, l)
 {
   type(FL_DOUBLE_WINDOW);
   clear_flag(FORCE_POSITION);
@@ -40,12 +40,7 @@ Fl_Double_Window::Fl_Double_Window(int W, int H, const char *l)
 
 
 Fl_Double_Window::Fl_Double_Window(int X, int Y, int W, int H, const char *l)
-: Fl_Window(X,Y,W,H,l, Fl_Window_Driver::newWindowDriver(this))
-{
-  type(FL_DOUBLE_WINDOW);
-}
-
-Fl_Double_Window::Fl_Double_Window(int x, int y, int w, int h, const char* title, Fl_Window_Driver *driver) : Fl_Window(x,y,w,h,title, driver)
+: Fl_Window(X,Y,W,H,l)
 {
   type(FL_DOUBLE_WINDOW);
 }
@@ -60,10 +55,15 @@ void Fl_Double_Window::show() {
   return Fl_Display_Device::display_device()->driver()->can_do_alpha_blending();
 }*/
 
+
 /**
   Forces the window to be redrawn.
 */
-void Fl_Double_Window::flush() {flush(0);}
+void Fl_Double_Window::flush()
+{
+  flush(0);
+}
+
 
 /**
   Forces the window to be redrawn.
diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx
index 58224f399..c1ae2728e 100644
--- a/src/Fl_Overlay_Window.cxx
+++ b/src/Fl_Overlay_Window.cxx
@@ -30,7 +30,7 @@
 
 
 Fl_Overlay_Window::Fl_Overlay_Window(int W, int H, const char *l)
-: Fl_Double_Window(0,0,W,H,l,Fl_Window_Driver::newWindowDriver(this))
+: Fl_Double_Window(0,0,W,H,l)
 {
   overlay_ = 0;
   image(0);
@@ -38,7 +38,7 @@ Fl_Overlay_Window::Fl_Overlay_Window(int W, int H, const char *l)
 }
 
 Fl_Overlay_Window::Fl_Overlay_Window(int X, int Y, int W, int H, const char *l)
-: Fl_Double_Window(X,Y,W,H,l,Fl_Window_Driver::newWindowDriver(this))
+: Fl_Double_Window(X,Y,W,H,l)
 {
   overlay_ = 0;
   image(0);
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 99c730938..97045174b 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -61,14 +61,8 @@ void Fl_Window::_Fl_Window() {
 }
 
 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))
-{
-  _Fl_Window();
-  set_flag(FORCE_POSITION);
-}
-
-Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l, Fl_Window_Driver *driver) : Fl_Group(X, Y, W, H, l), pWindowDriver(driver)
+  Fl_Group(X, Y, W, H, l),
+  pWindowDriver(Fl_Window_Driver::newWindowDriver(this))
 {
   _Fl_Window();
   set_flag(FORCE_POSITION);