X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa4d3151d6218dd21cc9cd6e77ddc0181aa3414c..377a6b3ef534fc8ec46e84b360f1c27837e9f39a:/include/wx/mac/carbon/toplevel.h diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h index 9eef94c683..cffc02d64a 100644 --- a/include/wx/mac/carbon/toplevel.h +++ b/include/wx/mac/carbon/toplevel.h @@ -12,10 +12,6 @@ #ifndef _WX_MSW_TOPLEVEL_H_ #define _WX_MSW_TOPLEVEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toplevel.h" -#endif - #if wxUSE_SYSTEM_OPTIONS #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition") #endif @@ -55,6 +51,10 @@ public: virtual wxPoint GetClientAreaOrigin() const; + // Attracts the users attention to this window if the application is + // inactive (should be called when a background event occurs) + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); + // implement base class pure virtuals virtual void Maximize(bool maximize = TRUE); virtual bool IsMaximized() const; @@ -66,9 +66,8 @@ public: virtual bool SetShape(const wxRegion& region); - virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style) = wxFULLSCREEN_ALL) - { return FALSE; } - virtual bool IsFullScreen() const { return FALSE; } + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ; + virtual bool IsFullScreen() const ; // implementation from now on // -------------------------- @@ -83,6 +82,7 @@ public: WXWindow MacGetWindowRef() { return m_macWindow ; } virtual void MacActivate( long timestamp , bool inIsActivating ) ; + virtual void MacPerformUpdates() ; virtual void Raise(); virtual void Lower(); @@ -95,12 +95,15 @@ public: virtual void MacInstallTopLevelWindowEventHandler() ; void MacSetMetalAppearance( bool on ) ; + bool MacGetMetalAppearance() const ; void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ; wxUint32 MacGetWindowAttributes() const ; WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } + virtual void MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ; + protected: // common part of all ctors void Init(); @@ -121,6 +124,7 @@ protected: WXWindow m_macWindow ; wxWindowMac* m_macFocus ; + void *m_macFullScreenData ; static wxTopLevelWindowMac *s_macDeactivateWindow; private :