Make MacSetMetalAppearance private so that the extra style flags can't get out of sync with the OS X-level metal flags by calling MacSetMetalAppearance directly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -98,7 +98,6 @@ public:
|
|||||||
bool MacUsesCompositing() { return m_macUsesCompositing; }
|
bool MacUsesCompositing() { return m_macUsesCompositing; }
|
||||||
virtual void MacInstallTopLevelWindowEventHandler() ;
|
virtual void MacInstallTopLevelWindowEventHandler() ;
|
||||||
|
|
||||||
void MacSetMetalAppearance( bool on ) ;
|
|
||||||
bool MacGetMetalAppearance() const ;
|
bool MacGetMetalAppearance() const ;
|
||||||
|
|
||||||
void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
|
void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
|
||||||
@@ -132,6 +131,12 @@ protected:
|
|||||||
|
|
||||||
static wxTopLevelWindowMac *s_macDeactivateWindow;
|
static wxTopLevelWindowMac *s_macDeactivateWindow;
|
||||||
private :
|
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 ;
|
WXEVENTHANDLERREF m_macEventHandler ;
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
|
Reference in New Issue
Block a user