X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35ff90a0b30bf24fcb9478a3c43143c124bbff46..213ad8e72cb6e838d15bf54145d661b081dca308:/include/wx/gtk/toplevel.h?ds=sidebyside diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index c55ec91352..304f312de2 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -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,9 +43,9 @@ 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); @@ -62,9 +56,15 @@ public: virtual bool SetShape(const wxRegion& region); - virtual bool Show(bool show = TRUE); + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); + + virtual void SetWindowStyleFlag( long style ); + + virtual bool Show(bool show = true); - virtual bool HasFocus(); + virtual void Raise(); + + virtual bool IsActive(); virtual void SetTitle( const wxString &title ); virtual wxString GetTitle() const { return m_title; } @@ -78,10 +78,6 @@ public: // implementation from now on // -------------------------- - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() - virtual void DoMoveWindow(int x, int y, int width, int height); - // GTK callbacks virtual void GtkOnSize( int x, int y, int width, int height ); virtual void OnInternalIdle(); @@ -89,7 +85,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; @@ -104,10 +99,18 @@ 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(); + // move the window to the specified location and resize it: this is called + // from both DoSetSize() and DoSetClientSize() + virtual void DoMoveWindow(int x, int y, int width, int height); + // override wxWindow methods to take into account tool/menu/statusbars virtual void DoSetSize(int x, int y, int width, int height, @@ -116,6 +119,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