Make MacSetMetalAppearance private so that the extra style flags can't get out of...

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

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index dc0e1b5a5dd517030979f05319bb8e687f3b3f33..9383af61c6582103d13b96c61c6021af2c0f9061 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -98,7 +98,6 @@ public:
     bool MacUsesCompositing() { return m_macUsesCompositing; }
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacUsesCompositing() { return m_macUsesCompositing; }
     virtual void MacInstallTopLevelWindowEventHandler() ;
 

-    void MacSetMetalAppearance( bool on ) ;

     bool MacGetMetalAppearance() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     bool MacGetMetalAppearance() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;


@@ -132,6 +131,12 @@ protected:
 
     static wxTopLevelWindowMac *s_macDeactivateWindow;
 private :
 
     static wxTopLevelWindowMac *s_macDeactivateWindow;
 private :

+    // KH: We cannot let this be called directly since the metal appearance is now managed by an
+    // extra style. Calling this function directly can result in blank white window backgrounds.
+    // This is because the ExtraStyle flags get out of sync with the metal appearance and the metal
+    // logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
+    void MacSetMetalAppearance( bool on ) ;
+

     WXEVENTHANDLERREF    m_macEventHandler ;
 
     DECLARE_EVENT_TABLE()
     WXEVENTHANDLERREF    m_macEventHandler ;
 
     DECLARE_EVENT_TABLE()