guard code for mac / quickdraw

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index fdbdf4ba0fd22daa06c4289e32978ebadb216a77..c0217bb8aea49993fff393a1a6508ff93128c825 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -95,6 +95,7 @@ wxSize wxStaticText::DoGetBestSize() const
         SInt16 baseline;
         wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
 
         SInt16 baseline;
         wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
 

+#ifndef __LP64__

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


@@ -103,24 +104,13 @@ wxSize wxStaticText::DoGetBestSize() const
             verify_noerr( err );
         }
         else
             verify_noerr( err );
         }
         else

+#endif

         {
         {

-    #if wxMAC_USE_CORE_GRAPHICS

             wxClientDC dc(const_cast<wxStaticText*>(this));
             wxCoord width, height ;
             dc.GetTextExtent( m_label , &width, &height);
             bounds.h = width;
             bounds.v = height;
             wxClientDC dc(const_cast<wxStaticText*>(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

         }
 
         if ( m_label.empty() )
         }
 
         if ( m_label.empty() )