Renamed HasChildren() to IsContainer(), added GetParent() to wxDataViewModel

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index e714803be9a62274019aa3a7b71a871049c41d61..8b01a82e9edafb841c2be13e459864ee47a43f39 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 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();
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 


@@ -93,17 +92,17 @@ public:
     int           m_miniEdge,
                   m_miniTitle;
     GtkWidget    *m_mainWidget;
     int           m_miniEdge,
                   m_miniTitle;
     GtkWidget    *m_mainWidget;

-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */

 
     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;
 
     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;

-    long          m_fsSaveFlag;

     wxRect        m_fsSaveFrame;
 
     // m_windowStyle translated to GDK's terms
     long          m_gdkFunc,
                   m_gdkDecor;
 
     wxRect        m_fsSaveFrame;
 
     // m_windowStyle translated to GDK's terms
     long          m_gdkFunc,
                   m_gdkDecor;
 

+    bool m_sizeSet;
+

     // 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;
     // 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;


@@ -114,28 +113,39 @@ public:
                                  int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
                                  int incW = wxDefaultCoord, int incH = wxDefaultCoord );
 
                                  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;
+
+    void GtkUpdateSize() { m_sizeSet = false; }
+

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
+    // move the window to the specified location and resize it

     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     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);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-                                 
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoGetClientSize( int *width, int *height ) const;

 
 

-    wxString      m_title;
+    // override these methods to take into account tool/menu/statusbars
+    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;

 
     // is the frame currently iconized?
     bool m_isIconized;
 
     // 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;
 };
 
     bool m_grabbed;
 };