Rewrite Fl_Menu_Window class under the driver model.

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

1 files changed, 11 insertions, 8 deletions

diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index 02c4679b2..0bcc5eca1 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -72,14 +72,6 @@ public:
   int shown() const { return pWindow->shown(); }
   /** returns the parent of the window. */
   Fl_Group *parent() const { return pWindow->parent(); }
-  /** for an Fl_Overlay_Window, returns the value of its overlay_ member variable */
-  Fl_Window *overlay() {
-    return pWindow->as_overlay_window() ? pWindow->as_overlay_window()->overlay_ : NULL;
-  }
-  /** for an Fl_Overlay_Window, sets the value of its overlay_ member variable */
-  void overlay(Fl_Window *o) {
-    if (pWindow->as_overlay_window()) pWindow->as_overlay_window()->overlay_ = o;
-  }
 
   // --- accessors to private window data
   int minw();
@@ -94,6 +86,15 @@ public:
   void force_position(int c);
   void x(int X);
   void y(int Y);
+  void current(Fl_Window *c);
+  /** for an Fl_Overlay_Window, returns the value of its overlay_ member variable */
+  Fl_Window *overlay() {
+    return pWindow->as_overlay_window() ? pWindow->as_overlay_window()->overlay_ : NULL;
+  }
+  /** for an Fl_Overlay_Window, sets the value of its overlay_ member variable */
+  void overlay(Fl_Window *o) {
+    if (pWindow->as_overlay_window()) pWindow->as_overlay_window()->overlay_ = o;
+  }
 
   // --- window data
   virtual int decorated_w() = 0;
@@ -104,6 +105,8 @@ public:
   virtual void flush_double();
   virtual void flush_overlay();
   virtual void flush_single();
+  virtual void flush_menu();
+  virtual void erase_menu() {}
   virtual void draw_begin();
   virtual void draw_end();
   void draw();