Beginning of Albrecht's plan for Fl_Window and Fl_Window_Driver classes.

Still unclear whether the implementation of the flush() functions follows the plan.
The Fl_Printer class is fully rewritten under the driver model.

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

2 files changed, 0 insertions, 17 deletions

diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 126f4b103..9b7e1954b 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -81,10 +81,8 @@ public:
   virtual void flush_double();
   virtual void flush_overlay();
   virtual void draw_begin();
-  virtual void draw_end();
 
   virtual void shape(const Fl_Image* img);
-  virtual void draw();
   virtual void icons(const Fl_RGB_Image *icons[], int count);
   virtual const void *icon() const;
   virtual void icon(const void * ic);
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index b8ca36480..fc278c553 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -148,11 +148,6 @@ void Fl_X11_Window_Driver::draw_begin()
 }
 
 
-void Fl_X11_Window_Driver::draw_end()
-{
-}
-
-
 void Fl_X11_Window_Driver::flush_single()
 {
   if (!pWindow->shown()) return;
@@ -394,16 +389,6 @@ void Fl_X11_Window_Driver::combine_mask()
 }
 
 
-void Fl_X11_Window_Driver::draw() {
-  if (shape_data_) {
-    if (( shape_data_->lw_ != pWindow->w() || shape_data_->lh_ != pWindow->h() ) && shape_data_->shape_) {
-      // size of window has changed since last time
-      combine_mask();
-    }
-  }
-  Fl_Window_Driver::draw();
-}
-
 void Fl_X11_Window_Driver::icons(const Fl_RGB_Image *icons[], int count) {
   free_icons();