X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/245f35816d761212279e8cf223475efb7a367553..594ed110f77d9f29f7165a07bb806e5a4fa19b0e:/include/wx/mac/toplevel.h diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h index c0705c0cd6..ffb0bcd288 100644 --- a/include/wx/mac/toplevel.h +++ b/include/wx/mac/toplevel.h @@ -12,10 +12,14 @@ #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 +#if wxUSE_SYSTEM_OPTIONS + #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition") +#endif + // ---------------------------------------------------------------------------- // wxTopLevelWindowMac // ---------------------------------------------------------------------------- @@ -75,7 +79,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 ) ; @@ -94,6 +98,8 @@ public: virtual void DoMoveWindow(int x, int y, int width, int height); void MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) ; short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; } + static bool MacEnableCompositing( bool useCompositing ); + bool MacUsesCompositing() { return m_macUsesCompositing; } #if TARGET_CARBON WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } @@ -108,6 +114,7 @@ protected: // should the frame be maximized when it will be shown? set by Maximize() // when it is called while the frame is hidden bool m_maximizeOnShow; + bool m_macUsesCompositing ; short m_macWindowBackgroundTheme ; WXWindow m_macWindow ; @@ -118,6 +125,7 @@ protected: static WXWindow s_macWindowInUpdate ; static wxTopLevelWindowMac *s_macDeactivateWindow; + static bool s_macWindowCompositing ; private : #if TARGET_CARBON WXEVENTHANDLERREF m_macEventHandler ;