make wxVarVScrollLegacyAdaptor::OnGetLineHeight() non-pure virtual to fix compilation...

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index e714803be9a62274019aa3a7b71a871049c41d61..fcc7ff98719a8bb289230ffffa58f9204d0cdc7e 100644 (file)
--- 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();
 
@@ -114,6 +113,9 @@ public:
                                  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();
@@ -122,20 +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);
-                                 
+
+    // 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;
 };