freeze whole window for TLW

[wxWidgets.git] / src / osx / carbon / font.cpp

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 8ee911dc85ee807589cbf2f6fee1c95bd154a91c..f8c6f5f347c8fb3a66d49942e87dbe2a08b01ec0 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -28,11 +28,6 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-#if wxOSX_USE_ATSU_TEXT && !wxOSX_USE_CARBON
-// include themeing support
-#include <Carbon/Carbon.h>
-#endif
-

 #include <map>
 #include <string>
 
 #include <map>
 #include <string>
 


@@ -66,10 +61,6 @@ public:
 
     virtual ~wxFontRefData();
 
 
     virtual ~wxFontRefData();
 

-    void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
-
-    bool GetNoAntiAliasing() const { return m_noAA; }
-

     void SetPointSize( int size )
     {
         if( GetPointSize() != size )
     void SetPointSize( int size )
     {
         if( GetPointSize() != size )


@@ -159,11 +150,10 @@ protected:
 #if wxOSX_USE_CORE_TEXT
     // void Init( CTFontRef font );
 #endif
 #if wxOSX_USE_CORE_TEXT
     // void Init( CTFontRef font );
 #endif

-    bool            m_noAA;      // No anti-aliasing

 public:
     bool            m_fontValid;
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
 public:
     bool            m_fontValid;
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT

-    // for true themeing support we must store the correct font
+    // for true theming support we must store the correct font

     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;
 #endif
     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;
 #endif


@@ -189,7 +179,6 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
 {
     Init();
     m_info = data.m_info;
 {
     Init();
     m_info = data.m_info;

-    m_noAA = data.m_noAA;

     m_fontValid = data.m_fontValid;
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     m_macThemeFontID = data.m_macThemeFontID;
     m_fontValid = data.m_fontValid;
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     m_macThemeFontID = data.m_macThemeFontID;


@@ -224,7 +213,6 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
 
 void wxFontRefData::Init()
 {
 
 void wxFontRefData::Init()
 {

-    m_noAA = false;

 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     m_macThemeFontID = kThemeCurrentPortFont ;
 #endif
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     m_macThemeFontID = kThemeCurrentPortFont ;
 #endif


@@ -346,7 +334,7 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
                 m_macThemeFontID = kThemeMiniSystemFont;
                 break;
            case wxOSX_SYSTEM_FONT_MINI_BOLD:
                 m_macThemeFontID = kThemeMiniSystemFont;
                 break;
            case wxOSX_SYSTEM_FONT_MINI_BOLD:

-                // bold not available under themeing
+                // bold not available under theming

                 m_macThemeFontID = kThemeMiniSystemFont;
                 break;
             case wxOSX_SYSTEM_FONT_LABELS:
                 m_macThemeFontID = kThemeMiniSystemFont;
                 break;
             case wxOSX_SYSTEM_FONT_LABELS:


@@ -399,6 +387,8 @@ void wxFontRefData::MacFindFont()
     if ( m_fontValid )
         return;
 
     if ( m_fontValid )
         return;
 

+    wxCHECK_RET( m_info.m_pointSize > 0, wxT("Point size should not be zero.") );
+

     m_info.EnsureValid();
 
 #if wxOSX_USE_CORE_TEXT
     m_info.EnsureValid();
 
 #if wxOSX_USE_CORE_TEXT


@@ -477,7 +467,8 @@ void wxFontRefData::MacFindFont()
                                      WXSIZEOF(atsuTags),
                                      atsuTags, atsuSizes, atsuValues);
 
                                      WXSIZEOF(atsuTags),
                                      atsuTags, atsuSizes, atsuValues);
 

-        wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
+        wxASSERT_MSG( status == noErr , wxString::Format(wxT("couldn't modify ATSU style. Status was %d"), (int) status).c_str() );
+

         if ( m_cgFont.get() == NULL )
         {
             ATSFontRef fontRef = FMGetATSFontRefFromFont(m_info.m_atsuFontID);
         if ( m_cgFont.get() == NULL )
         {
             ATSFontRef fontRef = FMGetATSFontRefFromFont(m_info.m_atsuFontID);


@@ -658,13 +649,6 @@ void wxFont::SetUnderlined(bool underlined)
     M_FONTDATA->SetUnderlined( underlined );
 }
 
     M_FONTDATA->SetUnderlined( underlined );
 }
 

-void wxFont::SetNoAntiAliasing( bool no )
-{
-    AllocExclusive();
-
-    M_FONTDATA->SetNoAntiAliasing( no );
-}
-

 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------


@@ -735,13 +719,6 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->GetEncoding() ;
 }
 
     return M_FONTDATA->GetEncoding() ;
 }
 

-bool wxFont::GetNoAntiAliasing() const
-{
-    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
-
-    return M_FONTDATA->GetNoAntiAliasing();
-}
-

 #if wxOSX_USE_ATSU_TEXT && wxOSX_USE_CARBON
 
 short wxFont::MacGetFontNum() const
 #if wxOSX_USE_ATSU_TEXT && wxOSX_USE_CARBON
 
 short wxFont::MacGetFontNum() const


@@ -877,11 +854,11 @@ static CTFontDescriptorRef wxMacCreateCTFontDescriptor(CFStringRef iFamilyName,
     CTFontDescriptorRef descriptor = NULL;
     CFMutableDictionaryRef attributes;
 
     CTFontDescriptorRef descriptor = NULL;
     CFMutableDictionaryRef attributes;
 

-    assert(iFamilyName != NULL);
+    wxASSERT(iFamilyName != NULL);

     // Create a mutable dictionary to hold our attributes.
     attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
                                            &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
     // Create a mutable dictionary to hold our attributes.
     attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
                                            &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

-    check(attributes != NULL);
+    wxASSERT(attributes != NULL);

 
     if (attributes != NULL) {
         // Add a family name to our attributes.
 
     if (attributes != NULL) {
         // Add a family name to our attributes.


@@ -895,13 +872,13 @@ static CTFontDescriptorRef wxMacCreateCTFontDescriptor(CFStringRef iFamilyName,
             // Create the traits dictionary.
             symTraits = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type,
                                        &iTraits);
             // Create the traits dictionary.
             symTraits = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type,
                                        &iTraits);

-            check(symTraits != NULL);
+            wxASSERT(symTraits != NULL);

 
             if (symTraits != NULL) {
                 // Create a dictionary to hold our traits values.
                 traits = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
                                                    &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
             if (symTraits != NULL) {
                 // Create a dictionary to hold our traits values.
                 traits = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
                                                    &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

-                check(traits != NULL);
+                wxASSERT(traits != NULL);

 
                 if (traits != NULL) {
                     // Add the symbolic traits value to the traits dictionary.
 
                 if (traits != NULL) {
                     // Add the symbolic traits value to the traits dictionary.


@@ -916,7 +893,7 @@ static CTFontDescriptorRef wxMacCreateCTFontDescriptor(CFStringRef iFamilyName,
         }
         // Create the font descriptor with our attributes
         descriptor = CTFontDescriptorCreateWithAttributes(attributes);
         }
         // Create the font descriptor with our attributes
         descriptor = CTFontDescriptorCreateWithAttributes(attributes);

-        check(descriptor != NULL);
+        wxASSERT(descriptor != NULL);

 
         CFRelease(attributes);
     }
 
         CFRelease(attributes);
     }