Added GetMaxSize virtual method for use by sizers.

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 5e747f150d57b5419dc03b9af61092de11e736ca..90863adfca4b8ae650db376f169b399276195cab 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -120,8 +120,11 @@ public:
     // arrange status bar, toolbar etc.
     virtual bool PreResize();
     
     // arrange status bar, toolbar etc.
     virtual bool PreResize();
     

-    // Generates paint events
-    void X11SendPaintEvents();
+    // Generates paint events from m_updateRegion
+    void SendPaintEvents();
+    
+    // Generates erase events from m_clearRegion
+    void SendEraseEvents();

     
     // Clip to paint region?
     bool GetClipPaintRegion() { return m_clipPaintRegion; }
     
     // Clip to paint region?
     bool GetClipPaintRegion() { return m_clipPaintRegion; }


@@ -145,11 +148,11 @@ public:
     // For compatibility across platforms (not in event table)
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
     
     // For compatibility across platforms (not in event table)
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
     

-protected:
-    // 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);
+    // Go up to a toplevel window and query which window has the focus.
+    // May return NULL.
+    wxWindow *GetFocusWidget();

     
     

+protected:

     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);