compositing and transtion changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index 7fd6551dc15b335c38ecba2655d5ae1e4493efe0..5f1f303b7f003ce0c89d1c6b95b312f180b11af0 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -16,6 +16,10 @@
     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 

+#if wxUSE_SYSTEM_OPTIONS
+    #define wxMAC_WINDOW_PLAIN_TRANSITION _T("MAC_WINDOW_PLAIN_TRANSITION")
+#endif
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac
 // ----------------------------------------------------------------------------


@@ -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 ; }
     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 ; }
 
 #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;
     // 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 ;
 
     short m_macWindowBackgroundTheme ;
     WXWindow m_macWindow ;


@@ -118,6 +125,7 @@ protected:
 
     static WXWindow s_macWindowInUpdate ;
     static wxTopLevelWindowMac *s_macDeactivateWindow;
 
     static WXWindow s_macWindowInUpdate ;
     static wxTopLevelWindowMac *s_macDeactivateWindow;

+    static bool s_macWindowCompositing ;

 private :
 #if TARGET_CARBON
     WXEVENTHANDLERREF    m_macEventHandler ;
 private :
 #if TARGET_CARBON
     WXEVENTHANDLERREF    m_macEventHandler ;