X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/949ff63e2f81719cd47a6c6b26047ee57c0aa052..f57258724a56bca5c473737fbe19e2fc60ce7bd3:/include/wx/gtk/toplevel.h

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 7c0998c7df..e059880ab3 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -83,40 +83,44 @@ public:
     // --------------------------
 
     // GTK callbacks
-    virtual void GtkOnSize();
     virtual void OnInternalIdle();
 
     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 
-    int           m_miniEdge,
-                  m_miniTitle;
     GtkWidget    *m_mainWidget;
-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
+
+    bool m_deferShow;
 
     bool          m_fsIsShowing;         /* full screen */
-    long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;
-    long          m_fsSaveFlag;
+    int           m_fsSaveGdkFunc, m_fsSaveGdkDecor;
     wxRect        m_fsSaveFrame;
 
     // m_windowStyle translated to GDK's terms
-    long          m_gdkFunc,
+    int           m_gdkFunc,
                   m_gdkDecor;
 
+    // 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;
 
-    // give hints to the Window Manager for how the size
-    // of the TLW can be changed by dragging
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
-                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
-
-    // return the full size of the window without WM decorations
+    // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
+    void GTKUpdateDecorSize(const wxSize& decorSize);
+
 protected:
+    // give hints to the Window Manager for how the size
+    // of the TLW can be changed by dragging
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW, int maxH,
+                                 int incW, int incH);
     // common part of all ctors
     void Init();
 
@@ -124,22 +128,19 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // take into account WM decorations here
-    virtual void DoGetSize(int *width, int *height) const;
     virtual void DoSetSize(int x, int y,
                            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;
 
-    // this method takes the size of the window not taking account of
-    // decorations
-    void GTKDoSetSize(int width, int height);
-
-
     // string shown in the title bar
     wxString m_title;
 
+private:
+    wxSize& GetCachedDecorSize();
+
     // is the frame currently iconized?
     bool m_isIconized;