check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / mac / carbon / button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 42e2004f51c33f942f8f360738baa87e2a10a7af..6d9d195748e1b7e0da428ddf40d555a79632faf1 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -61,7 +61,6 @@ bool wxButton::Create(wxWindow *parent,
     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {

-#if TARGET_API_MAC_OSX

         // Button height is static in Mac, can't be changed, so we need to force it here
         if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
         {
         // Button height is static in Mac, can't be changed, so we need to force it here
         if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
         {


@@ -78,8 +77,6 @@ bool wxButton::Create(wxWindow *parent,
             bounds.bottom = bounds.top + 15 ;
             m_maxHeight = 15 ;
         }
             bounds.bottom = bounds.top + 15 ;
             m_maxHeight = 15 ;
         }

-#endif
-

         err = CreatePushButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
             &bounds, CFSTR(""), m_peer->GetControlRefAddr() );
         err = CreatePushButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
             &bounds, CFSTR(""), m_peer->GetControlRefAddr() );


@@ -155,10 +152,10 @@ wxSize wxButton::DoGetBestSize() const
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 

-        SInt16 baseline;

         wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
 
         wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
 

-#ifndef __LP64__
+#if wxMAC_USE_ATSU_TEXT
+        SInt16 baseline;

         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {
             err = GetThemeTextDimensions(
         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {
             err = GetThemeTextDimensions(


@@ -169,23 +166,11 @@ wxSize wxButton::DoGetBestSize() const
         else
 #endif
         {
         else
 #endif
         {

-#if wxMAC_USE_CORE_GRAPHICS

             wxClientDC dc(const_cast<wxButton*>(this));
             wxCoord width, height ;
             dc.GetTextExtent( m_label , &width, &height);
             bounds.h = width;
             bounds.v = height;
             wxClientDC dc(const_cast<wxButton*>(this));
             wxCoord width, height ;
             dc.GetTextExtent( m_label , &width, &height);
             bounds.h = width;
             bounds.v = height;

-#else
-            wxMacWindowStateSaver sv( this );
-            ::TextFont( m_font.MacGetFontNum() );
-            ::TextSize( (short)(m_font.MacGetFontSize()) );
-            ::TextFace( m_font.MacGetFontStyle() );
-
-            err = GetThemeTextDimensions(
-                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
-                kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
-            verify_noerr( err );
-#endif

         }
 
         wBtn = bounds.h + sz.y;
         }
 
         wBtn = bounds.h + sz.y;