renamed GetColHeader() to GetGridColHeader() for consistency with the other existing...

[wxWidgets.git] / include / wx / gtk / toplevel.h

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 3d645485739ed85c3c296234c42cd216a3db3f53..e059880ab3b106e8d6a01658499de2b1d5a770bc 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -16,7 +16,6 @@
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {
-    DECLARE_EVENT_TABLE()
 public:
     // construction
     wxTopLevelWindowGTK() { Init(); }
@@ -86,14 +85,13 @@ public:
     // GTK callbacks
     virtual void OnInternalIdle();
 
-    // Respond to system colour change
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 
     GtkWidget    *m_mainWidget;
 
+    bool m_deferShow;
+
     bool          m_fsIsShowing;         /* full screen */
     int           m_fsSaveGdkFunc, m_fsSaveGdkDecor;
     wxRect        m_fsSaveFrame;
@@ -105,6 +103,9 @@ public:
     // size of WM decorations
     wxSize m_decorSize;
 
+    // shape of the frame
+    wxRegion m_shape;
+
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
     int m_urgency_hint;
@@ -112,8 +113,7 @@ public:
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
-    // whether frame extents are accurate
-    virtual bool IsDecorCacheable() const;
+    void GTKUpdateDecorSize(const wxSize& decorSize);
 
 protected:
     // give hints to the Window Manager for how the size
@@ -132,13 +132,15 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
-    // override these methods to take into account tool/menu/statusbars
+    virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize(int *width, int *height) const;
 
     // string shown in the title bar
     wxString m_title;
 
 private:
+    wxSize& GetCachedDecorSize();
+
     // is the frame currently iconized?
     bool m_isIconized;