no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index e714803be9a62274019aa3a7b71a871049c41d61..a5e356e2db633dc0b096f2dc9a1a9f371ee84d0f 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();
 


@@ -80,63 +79,80 @@ public:
     virtual void RemoveGrab();
     virtual bool IsGrabbed() const { return m_grabbed; }
 
     virtual void RemoveGrab();
     virtual bool IsGrabbed() const { return m_grabbed; }
 

+
+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = (const wxRect *) NULL );
+

     // implementation from now on
     // --------------------------
 
     // GTK callbacks
     // implementation from now on
     // --------------------------
 
     // 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);
 
     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;
     GtkWidget    *m_mainWidget;

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

 
     bool          m_fsIsShowing;         /* full screen */
 
     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
     wxRect        m_fsSaveFrame;
 
     // m_windowStyle translated to GDK's terms

-    long          m_gdkFunc,
+    int           m_gdkFunc,

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

+    // 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,
     // 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 );
-
-protected:
+                                 int maxW, int maxH,
+                                 int incW, int incH);

     // common part of all ctors
     void Init();
 
     // 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 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 DoSetClientSize(int width, int height);

-    virtual void DoGetClientSize( int *width, int *height ) const;
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+    // string shown in the title bar
+    wxString m_title;

 
 

-    wxString      m_title;
+    bool m_deferShow;
+
+private:
+    wxSize& GetCachedDecorSize();

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

+
+    bool m_updateDecorSize;
+    bool m_deferShowAllowed;

 };
 
 #endif // _WX_GTK_TOPLEVEL_H_
 };
 
 #endif // _WX_GTK_TOPLEVEL_H_