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 f79d378d50fb004e0a1a208e8f967ff8a0f8a985..90863adfca4b8ae650db376f169b399276195cab 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -111,7 +111,7 @@ public:
     WXDisplay *GetXDisplay() const;
     
     void SetLastClick(int button, long timestamp)
     WXDisplay *GetXDisplay() const;
     
     void SetLastClick(int button, long timestamp)

-    { m_lastButton = button; m_lastTS = timestamp; }
+        { m_lastButton = button; m_lastTS = timestamp; }

     
     int GetLastClickedButton() const { return m_lastButton; }
     long GetLastClickTime() const { return m_lastTS; }
     
     int GetLastClickedButton() const { return m_lastButton; }
     long GetLastClickTime() const { return m_lastTS; }


@@ -120,12 +120,18 @@ 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; }
     

+    // Return clear region
+    wxRegion &GetClearRegion() { return m_clearRegion; }
+    

     // sets the fore/background colour for the given widget
     static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);
     static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
     // sets the fore/background colour for the given widget
     static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);
     static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE);


@@ -142,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);
     


@@ -156,11 +162,10 @@ protected:
     
 protected:
     WXWindow              m_mainWidget;
     
 protected:
     WXWindow              m_mainWidget;

-    

     wxRegion              m_clearRegion;
     bool                  m_clipPaintRegion;
     wxRegion              m_clearRegion;
     bool                  m_clipPaintRegion;

-    

     bool                  m_winCaptured;  // ????
     bool                  m_winCaptured;  // ????

+    bool                  m_needsInputFocus; // Input focus set in OnIdle

 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;