use WS_CLIPSIBLINGS for wxStaticLine as well

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 426505a5fdee0a5ba66ba468719299160ee0eff3..e7ef074f99572bf7aed23287589b9e82b8775e2d 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,6 +148,10 @@ 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)) {}
     

+    // Go up to a toplevel window and query which window has the focus.
+    // May return NULL.
+    wxWindow *GetFocusWidget();
+    

 protected:
     // Makes an adjustment to the window position (for example, a frame that has
     // a toolbar that it manages itself).
 protected:
     // Makes an adjustment to the window position (for example, a frame that has
     // a toolbar that it manages itself).