X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cda5834e9d51eabc6463da5c301a7b8a3e89d80f..781130bf6070ea8b93981ea95c1a786eefc2842e:/include/wx/gtk/toplevel.h

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index f27e872b6b..fcc7ff9871 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -47,7 +47,6 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
@@ -108,6 +107,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,26 +124,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);
 
-    // 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;
 
-    wxString      m_title;
+    // 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);
+
+
+    // 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;
 };