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 8b01a82e9edafb841c2be13e459864ee47a43f39..a5e356e2db633dc0b096f2dc9a1a9f371ee84d0f 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -79,46 +79,50 @@ 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;
 
     bool          m_fsIsShowing;         /* full screen */
     GtkWidget    *m_mainWidget;
 
     bool          m_fsIsShowing;         /* full screen */

-    long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;
+    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;
 

-    bool m_sizeSet;
+    // 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;
 

-    // 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
+    // return the size of the window without WM decorations

     void GTKDoGetSize(int *width, int *height) const;
 
     void GTKDoGetSize(int *width, int *height) const;
 

-    void GtkUpdateSize() { m_sizeSet = false; }
+    void GTKUpdateDecorSize(const wxSize& decorSize);

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

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


@@ -126,27 +130,29 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // take into account WM decorations here
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // 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);
 

-    // 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
-    void GTKDoSetSize(int width, int height);
-
-

     // string shown in the title bar
     wxString m_title;
 
     // string shown in the title bar
     wxString m_title;
 

+    bool m_deferShow;
+
+private:
+    wxSize& GetCachedDecorSize();
+

     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently grabbed explicitly by the application?
     bool m_grabbed;
     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently grabbed explicitly by the application?
     bool m_grabbed;

+
+    bool m_updateDecorSize;
+    bool m_deferShowAllowed;

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