X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b05a60e14fe5a1309b7d46c5c87b25b1af3705..fa3b08caf17a6310540d623b6ce508c201efb9a5:/include/wx/gtk/toplevel.h?ds=sidebyside

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 6ebb2001c8..7e0a51d981 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -108,6 +108,15 @@ public:
     // 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
+    void GTKDoGetSize(int *width, int *height) const;
+
 protected:
     // common part of all ctors
     void Init();
@@ -116,30 +125,28 @@ protected:
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
-    // override wxWindow methods to take into account tool/menu/statusbars
+    // 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);
 
-    // a different API for SetSizeHints
-    virtual void SetMinSize(const wxSize& minSize);
-    virtual void SetMaxSize(const wxSize& maxSize);
-
-    // 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 );
-                                 
+    // 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;
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+    // this method takes the size of the window not taking account of
+    // decorations and is used by both DoSetSize() and DoSetClientSize()
+    void GTKDoSetSize(int width, int height);
 
-    wxString      m_title;
+
+    // string shown in the title bar
+    wxString m_title;
 
     // is the frame currently iconized?
     bool m_isIconized;
-    // is the frame currently grabbed explicitly
-    // by the application?
+
+    // is the frame currently grabbed explicitly by the application?
     bool m_grabbed;
 };