new VC++ workspace file for wxBase

[wxWidgets.git] / include / wx / motif / window.h

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index aefcae03a3b1a913b70eaa062626eeaa5cf5a0bd..443290b339a6e8e1d132b1bf185f28d10981a6cd 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -171,14 +171,14 @@ public:
     static void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
     static void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
 
     static void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
     static void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
 

-protected:
-    // event handlers (not virtual by design)
-    void OnIdle(wxIdleEvent& event);
-

     // For implementation purposes - sometimes decorations make the client area
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;
 
     // For implementation purposes - sometimes decorations make the client area
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;
 

+protected:
+    // event handlers (not virtual by design)
+    void OnIdle(wxIdleEvent& event);
+

     // Makes an adjustment to the window position (for example, a frame that has
     // a toolbar that it manages itself).
     virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);
     // Makes an adjustment to the window position (for example, a frame that has
     // a toolbar that it manages itself).
     virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);


@@ -203,11 +203,14 @@ protected:
     bool CanAddEventHandler() const { return m_canAddEventHandler; }
     void SetCanAddEventHandler(bool flag) { m_canAddEventHandler = flag; }
 
     bool CanAddEventHandler() const { return m_canAddEventHandler; }
     void SetCanAddEventHandler(bool flag) { m_canAddEventHandler = flag; }
 

+public:

     WXPixmap GetBackingPixmap() const { return m_backingPixmap; }
     WXPixmap GetBackingPixmap() const { return m_backingPixmap; }

+    void SetBackingPixmap(WXPixmap pixmap) { m_backingPixmap = pixmap; }

     int GetPixmapWidth() const { return m_pixmapWidth; }
     int GetPixmapHeight() const { return m_pixmapHeight; }
     int GetPixmapWidth() const { return m_pixmapWidth; }
     int GetPixmapHeight() const { return m_pixmapHeight; }

+    void SetPixmapWidth(int w) { m_pixmapWidth = w; }
+    void SetPixmapHeight(int h) { m_pixmapHeight = h; }

 
 

-public:

     // Change properties
     virtual void ChangeFont(bool keepOriginalSize = TRUE);             // Change to the current font (often overridden)
 
     // Change properties
     virtual void ChangeFont(bool keepOriginalSize = TRUE);             // Change to the current font (often overridden)