Create class Fl_Widget_Surface that supports draw(Fl_Widget *, int, int).

This simplifies the implementation of Fl_Copy_Surface and Fl_Image_Surface
which now are made to derive from Fl_Widget_Surface.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index d6ffa6853..88b3a0737 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -71,7 +71,6 @@ class FL_EXPORT Fl_Window : public Fl_Group {
 
   friend class Fl_X;
   friend class Fl_Window_Driver;
-  friend class Fl_Paged_Device;
   Fl_Window_Driver *i; // points at the system-specific stuff
 
   struct icon_data {
@@ -99,8 +98,6 @@ class FL_EXPORT Fl_Window : public Fl_Group {
   uchar size_range_set;
   // cursor stuff
   Fl_Cursor cursor_default;
-  // Captures the titlebar and borders of the window, if they exist.
-  void capture_titlebar_and_borders(Fl_Shared_Image*& top, Fl_Shared_Image*& left, Fl_Shared_Image*& bottom, Fl_Shared_Image*& right);
   
 protected:
   /** Data supporting a non-rectangular window shape */
@@ -636,6 +633,8 @@ public:
    */
   int decorated_h();
 
+  // Captures the titlebar and borders of the window, if they exist.
+  void capture_titlebar_and_borders(Fl_Shared_Image*& top, Fl_Shared_Image*& left, Fl_Shared_Image*& bottom, Fl_Shared_Image*& right);
   Fl_Window_Driver *driver() { return i; }
 
 };