X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a446b03dccd9218f73ea00820e48d4bfc464600..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/gtk1/toplevel.h?ds=sidebyside diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h index 45bfd16771..a534a1dc66 100644 --- a/include/wx/gtk1/toplevel.h +++ b/include/wx/gtk1/toplevel.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/toplevel.h +// Name: wx/gtk1/toplevel.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,20 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKTOPLEVELH__ #define __GTKTOPLEVELH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toplevel.h" -#endif - - //----------------------------------------------------------------------------- // wxTopLevelWindowGTK //----------------------------------------------------------------------------- -class wxTopLevelWindowGTK : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase { public: // construction @@ -49,24 +43,23 @@ public: virtual ~wxTopLevelWindowGTK(); // implement base class pure virtuals - virtual void Maximize(bool maximize = TRUE); + virtual void Maximize(bool maximize = true); virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = TRUE); + 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 bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; + virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual bool SetShape(const wxRegion& region); -#if wxABI_VERSION >= 20602 virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); -#endif - virtual bool Show(bool show = TRUE); + virtual void SetWindowStyleFlag( long style ); + + virtual bool Show(bool show = true); virtual void Raise(); @@ -95,7 +88,6 @@ public: // do *not* call this to iconize the frame, this is a private function! void SetIconizeState(bool iconic); - wxString m_title; int m_miniEdge, m_miniTitle; GtkWidget *m_mainWidget; @@ -110,6 +102,10 @@ public: long m_gdkFunc, m_gdkDecor; + // 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; + protected: // common part of all ctors void Init(); @@ -122,6 +118,8 @@ protected: virtual void DoSetClientSize(int width, int height); virtual void DoGetClientSize( int *width, int *height ) const; + wxString m_title; + // is the frame currently iconized? bool m_isIconized; // is the frame currently grabbed explicitly