From 2d9d0118eacdaab7cf304ac28dd89bae0d820a72 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 11 May 2002 06:45:42 +0000 Subject: [PATCH] corrected appeaance of boxes und OSX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/control.cpp | 2 +- src/mac/control.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index cc93410764..ba80650d30 100644 --- 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 cc93410764..ba80650d30 100644 --- 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 ; -- 2.47.2