corrected printf format strings

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index cc93410764b4515916c2c0267e74ced50e9b622e..e1f7d4dd474553ffc46f89ce3a29c6ce856bc49c 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -36,7 +36,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 

-    EVT_CHAR( wxControl::OnKeyDown ) 
+//    EVT_CHAR( wxControl::OnKeyDown ) 

     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
 #endif
     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
 #endif


@@ -292,7 +292,7 @@ void wxControl::MacPostControlCreate()
     {
         // no font
     }
     {
         // 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 ;
     {
         ControlFontStyleRec     controlstyle ;
         controlstyle.flags = kControlUseFontMask ;