Added global skope too FinControl()

[wxWidgets.git] / src / mac / control.cpp

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 0dcfb505d021b2368ce23336d8705d3383ce6be0..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 ;
@@ -473,7 +473,7 @@ void  wxControl::DoSetSize(int x, int y,
         return ;
     }
 
-     Rect oldbounds, newbounds;
+     Rect oldbounds;
      int new_x, new_y, new_width, new_height;
      int mac_x, mac_y;