X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53e3cd047cb9d01952af76779e89e444915e86c6..9b49405777342458dc1666001865eef7309b6c30:/include/wx/gtk/toplevel.h diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index dcf60a8c7e..a5e356e2db 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -16,7 +16,6 @@ class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase { - DECLARE_EVENT_TABLE() public: // construction wxTopLevelWindowGTK() { Init(); } @@ -80,22 +79,21 @@ 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); - // do *not* call this to iconize the frame, this is a private function! void SetIconizeState(bool iconic); GtkWidget *m_mainWidget; - bool m_deferShow; - bool m_fsIsShowing; /* full screen */ int m_fsSaveGdkFunc, m_fsSaveGdkDecor; wxRect m_fsSaveFrame; @@ -107,6 +105,9 @@ 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; @@ -114,6 +115,8 @@ public: // 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 @@ -131,18 +134,25 @@ 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: + wxSize& GetCachedDecorSize(); + // 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_