simplifying alpha, adding commented part for high-res screens

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 2e4cd6eb3ed37881b90c37cbc118b489b2ab0b64..829729d46956fe43bd8d2b343eec09f27bf8d532 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -1183,6 +1183,9 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
 #if TARGET_API_MAC_OSX
     if ( m_macUsesCompositing )
         attr |= kWindowCompositingAttribute;
 #if TARGET_API_MAC_OSX
     if ( m_macUsesCompositing )
         attr |= kWindowCompositingAttribute;

+#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
+    attr |= kWindowFrameworkScaledAttribute;
+#endif

 #endif
 
     if ( HasFlag(wxFRAME_SHAPED) )
 #endif
 
     if ( HasFlag(wxFRAME_SHAPED) )


@@ -1434,8 +1437,7 @@ bool wxTopLevelWindowMac::IsFullScreen() const
 
 bool wxTopLevelWindowMac::SetTransparent(wxByte alpha)
 {
 
 bool wxTopLevelWindowMac::SetTransparent(wxByte alpha)
 {

-    WindowRef handle = GetControlOwner((OpaqueControlRef*)GetHandle());
-    OSStatus result = SetWindowAlpha(handle, float(alpha)/255.0);
+    OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, float(alpha)/255.0);

     return result == noErr;
 }
 
     return result == noErr;
 }