X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5c0761f51d88c917e2633b5c84d6fd05f6fb5a4..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/gtk/toplevel.h?ds=sidebyside diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index bd58083b8a..768f2e14f5 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -55,9 +55,7 @@ public: 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); @@ -95,6 +93,8 @@ public: // GTK callbacks virtual void OnInternalIdle(); + virtual void GTKHandleRealized(); + // do *not* call this to iconize the frame, this is a private function! void SetIconizeState(bool iconic); @@ -111,9 +111,6 @@ public: // 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; @@ -131,9 +128,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); @@ -151,8 +145,12 @@ protected: bool m_deferShow; private: + void Init(); wxSize& GetCachedDecorSize(); + // size hint increments + int m_incWidth, m_incHeight; + // is the frame currently iconized? bool m_isIconized;