X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e10daccc99be6d3ca7a206c69e94d3bfe6b03d..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk/toplevel.h?ds=sidebyside

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 2224a9a2c5..9f9374b06b 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/toplevel.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +15,7 @@
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {
-    DECLARE_EVENT_TABLE()
+    typedef wxTopLevelWindowBase base_type;
 public:
     // construction
     wxTopLevelWindowGTK() { Init(); }
@@ -53,10 +52,9 @@ public:
 
     virtual bool EnableCloseButton(bool enable = true);
 
+    virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
-
-    virtual bool SetShape(const wxRegion& region);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
@@ -71,6 +69,10 @@ public:
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
+    virtual void SetLabel(const wxString& label) { SetTitle( label ); }
+    virtual wxString GetLabel() const            { return GetTitle(); }
+
+
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
@@ -80,14 +82,19 @@ public:
     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
     virtual void OnInternalIdle();
 
-    // Respond to system colour change
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    virtual void GTKHandleRealized();
+
+    void GTKConfigureEvent(int x, int y);
 
     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
@@ -102,15 +109,23 @@ public:
     int           m_gdkFunc,
                   m_gdkDecor;
 
+    // size of WM decorations
+    struct DecorSize
+    {
+        int left, right, top, bottom;
+    };
+    DecorSize m_decorSize;
+
     // 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;
+    // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling
+    unsigned m_netFrameExtentsTimerId;
 
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
-    // whether frame extents are accurate
-    virtual bool IsDecorCacheable() const;
+    void GTKUpdateDecorSize(const DecorSize& decorSize);
 
 protected:
     // give hints to the Window Manager for how the size
@@ -118,9 +133,6 @@ protected:
     virtual void DoSetSizeHints( int minW, int minH,
                                  int maxW, int maxH,
                                  int incW, int incH);
-    // common part of all ctors
-    void Init();
-
     // move the window to the specified location and resize it
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
@@ -129,18 +141,29 @@ protected:
                            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;
 
     // string shown in the title bar
     wxString m_title;
 
+    bool m_deferShow;
+
 private:
+    void Init();
+    DecorSize& GetCachedDecorSize();
+
+    // size hint increments
+    int m_incWidth, m_incHeight;
+
     // 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_