X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be55ddb10d8a0ccfe08be1bd70c748d0061bf62f..c50f92d08cc3633f8127931e7cf5d362ab8ac392:/include/wx/mac/toplevel.h diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h index aa32bec6ee..7fd6551dc1 100644 --- a/include/wx/mac/toplevel.h +++ b/include/wx/mac/toplevel.h @@ -12,7 +12,7 @@ #ifndef _WX_MSW_TOPLEVEL_H_ #define _WX_MSW_TOPLEVEL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "toplevel.h" #endif @@ -58,6 +58,8 @@ public: virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); } virtual void Restore(); + 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; } @@ -65,6 +67,7 @@ public: // implementation from now on // -------------------------- + static void MacDelayedDeactivation(long timestamp); virtual void MacCreateRealWindow( const wxString& title, const wxPoint& pos, const wxSize& size, @@ -72,7 +75,7 @@ public: const wxString& name ) ; static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; } virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ; - virtual void Clear() ; + virtual void ClearBackground() ; virtual WXWidget MacGetContainerForEmbedding() ; WXWindow MacGetWindowRef() { return m_macWindow ; } virtual void MacActivate( long timestamp , bool inIsActivating ) ; @@ -114,6 +117,7 @@ protected: bool m_macNeedsErasing ; static WXWindow s_macWindowInUpdate ; + static wxTopLevelWindowMac *s_macDeactivateWindow; private : #if TARGET_CARBON WXEVENTHANDLERREF m_macEventHandler ;