Applied #10639 (Not all previewed fonts are displayed with the correct nameface)

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 135718cbdfb0151cbc8d10de7f5412f35abfbb7e..fe3f3a18bf04befcb32db6abb0e69d7da3b83e59 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -67,10 +67,6 @@
 #include "wx/osx/uma.h"
 #else
 #include "wx/osx/private.h"
-#if wxOSX_USE_COCOA
-// bring in themeing
-#include <Carbon/Carbon.h>
-#endif
 #endif
 
 #define MAC_SCROLLBAR_SIZE 15
@@ -244,7 +240,7 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them
-    if ( (! IsKindOf(CLASSINFO(wxControl)) 
+    if ( (! IsKindOf(CLASSINFO(wxControl))
 #if wxUSE_STATUSBAR
         && ! IsKindOf(CLASSINFO(wxStatusBar))
 #endif
@@ -333,7 +329,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             break ;
 
         default:
-            wxFAIL_MSG(_T("unexpected window variant"));
+            wxFAIL_MSG(wxT("unexpected window variant"));
             break ;
     }
     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
@@ -362,7 +358,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             break ;
 
         default:
-            wxFAIL_MSG(_T("unexpected window variant"));
+            wxFAIL_MSG(wxT("unexpected window variant"));
             break ;
     }
 
@@ -898,7 +894,7 @@ wxSize wxWindowMac::DoGetBestSize() const
             r.width =
             r.height = 16 ;
 
-            if ( 0 ) 
+            if ( 0 )
             {
             }
 #if wxUSE_SCROLLBAR