corrected appeaance of boxes und OSX

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index cc93410764b4515916c2c0267e74ced50e9b622e..ba80650d3081d11a3a8830e94f028b2386215227 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -292,7 +292,7 @@ void wxControl::MacPostControlCreate()
     {
         // no font
     }
-    else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )
+    else if ( !UMAHasAquaLayout() && (IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) ) )
     {
         ControlFontStyleRec     controlstyle ;
         controlstyle.flags = kControlUseFontMask ;

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index cc93410764b4515916c2c0267e74ced50e9b622e..ba80650d3081d11a3a8830e94f028b2386215227 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -292,7 +292,7 @@ void wxControl::MacPostControlCreate()
     {
         // no font
     }
-    else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )
+    else if ( !UMAHasAquaLayout() && (IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) ) )
     {
         ControlFontStyleRec     controlstyle ;
         controlstyle.flags = kControlUseFontMask ;