fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 1a699dcee8afb68b29d9be4f206463998cbed1c7..3d295d4bb901df0cd264ce2f6c82d0d22ec2f416 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -43,7 +43,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
 public:
     wxFontRefData()
     {

-        Init(10, wxDEFAULT, wxNORMAL, wxNORMAL,
+        Init(10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,

              false, wxT("applicationfont"), wxFONTENCODING_DEFAULT);
     }
 
              false, wxT("applicationfont"), wxFONTENCODING_DEFAULT);
     }
 


@@ -54,9 +54,9 @@ public:
     }
 
     wxFontRefData(int size,
     }
 
     wxFontRefData(int size,

-                  int family,
-                  int style,
-                  int weight,
+                  wxFontFamily family,
+                  wxFontStyle style,
+                  wxFontWeight weight,

                   bool underlined,
                   const wxString& faceName,
                   wxFontEncoding encoding)
                   bool underlined,
                   const wxString& faceName,
                   wxFontEncoding encoding)


@@ -84,32 +84,32 @@ public:
 
     int GetPointSize() const { return m_pointSize; }
 
 
     int GetPointSize() const { return m_pointSize; }
 

-    void SetFamily( int family )
+    void SetFamily( wxFontFamily family )

     {
         m_family = family;
         MacInvalidateNativeFont();
     }
 
 
     {
         m_family = family;
         MacInvalidateNativeFont();
     }
 
 

-    int GetFamily() const { return m_family; }
+    wxFontFamily GetFamily() const { return m_family; }

 
 

-    void SetStyle( int style )
+    void SetStyle( wxFontStyle style )

     {
         m_style = style;
         MacInvalidateNativeFont();
     }
 
 
     {
         m_style = style;
         MacInvalidateNativeFont();
     }
 
 

-    int GetStyle() const { return m_style; }
+    wxFontStyle GetStyle() const { return m_style; }

 
 

-    void SetWeight( int weight )
+    void SetWeight( wxFontWeight weight )

     {
         m_weight = weight;
         MacInvalidateNativeFont();
     }
 
 
     {
         m_weight = weight;
         MacInvalidateNativeFont();
     }
 
 

-    int GetWeight() const { return m_weight; }
+    wxFontWeight GetWeight() const { return m_weight; }

 
     void SetUnderlined( bool u )
     {
 
     void SetUnderlined( bool u )
     {


@@ -142,9 +142,9 @@ public:
 protected:
     // common part of all ctors
     void Init(int size,
 protected:
     // common part of all ctors
     void Init(int size,

-              int family,
-              int style,
-              int weight,
+              wxFontFamily family,
+              wxFontStyle style,
+              wxFontWeight weight,

               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);


@@ -154,9 +154,9 @@ protected:
 #endif
     // font characterstics
     int             m_pointSize;
 #endif
     // font characterstics
     int             m_pointSize;

-    int             m_family;
-    int             m_style;
-    int             m_weight;
+    wxFontFamily    m_family;
+    wxFontStyle     m_style;
+    wxFontWeight    m_weight;

     bool            m_underlined;
     wxString        m_faceName;
     wxFontEncoding  m_encoding;
     bool            m_underlined;
     wxString        m_faceName;
     wxFontEncoding  m_encoding;


@@ -202,9 +202,9 @@ public:
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,

-    int family,
-    int style,
-    int weight,
+    wxFontFamily family,
+    wxFontStyle style,
+    wxFontWeight weight,

     bool underlined,
     const wxString& faceName,
     wxFontEncoding encoding)
     bool underlined,
     const wxString& faceName,
     wxFontEncoding encoding)


@@ -345,7 +345,7 @@ wxFontRefData::wxFontRefData( CTFontDescriptorRef fontdescriptor, int size )
 
 void wxFontRefData::Init( CTFontRef font )
 {
 
 void wxFontRefData::Init( CTFontRef font )
 {

-    Init(10, wxDEFAULT, wxNORMAL, wxNORMAL,
+    Init(10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,

          false, wxT("applicationfont"), wxFONTENCODING_DEFAULT);
 
     m_ctFont.reset( font );
          false, wxT("applicationfont"), wxFONTENCODING_DEFAULT);
 
     m_ctFont.reset( font );


@@ -359,7 +359,7 @@ void wxFontRefData::MacFindFont()
 #if wxOSX_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
     {
 #if wxOSX_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
     {

-        if ( m_faceName.empty() && m_family == wxDEFAULT )
+        if ( m_faceName.empty() && m_family == wxFONTFAMILY_DEFAULT )

         {
             m_ctFont.reset(CTFontCreateUIFontForLanguage( kCTFontSystemFontType, 0.0, NULL ));
         }
         {
             m_ctFont.reset(CTFontCreateUIFontForLanguage( kCTFontSystemFontType, 0.0, NULL ));
         }


@@ -371,9 +371,9 @@ void wxFontRefData::MacFindFont()
             m_pointSize = CTFontGetSize(m_ctFont) ;
             CTFontSymbolicTraits traits = CTFontGetSymbolicTraits( m_ctFont );
             if ( traits & kCTFontItalicTrait )
             m_pointSize = CTFontGetSize(m_ctFont) ;
             CTFontSymbolicTraits traits = CTFontGetSymbolicTraits( m_ctFont );
             if ( traits & kCTFontItalicTrait )

-                m_style = wxITALIC;
+                m_style = wxFONTSTYLE_ITALIC;

             if (  traits & kCTFontBoldTrait )
             if (  traits & kCTFontBoldTrait )

-                m_weight = wxBOLD ;
+                m_weight = wxFONTWEIGHT_BOLD ;

         }
         else
         {
         }
         else
         {


@@ -381,22 +381,22 @@ void wxFontRefData::MacFindFont()
             {
                 switch ( m_family )
                 {
             {
                 switch ( m_family )
                 {

-                    case wxSCRIPT :
-                    case wxROMAN :
-                    case wxDECORATIVE :
+                    case wxFONTFAMILY_SCRIPT :
+                    case wxFONTFAMILY_ROMAN :
+                    case wxFONTFAMILY_DECORATIVE :

                         m_faceName = wxT("Times");
                         break ;
 
                         m_faceName = wxT("Times");
                         break ;
 

-                    case wxSWISS :
+                    case wxFONTFAMILY_SWISS :

                         m_faceName =  wxT("Helvetica");
                         break ;
 
                         m_faceName =  wxT("Helvetica");
                         break ;
 

-                    case wxMODERN :
-                    case wxTELETYPE:
+                    case wxFONTFAMILY_MODERN :
+                    case wxFONTFAMILY_TELETYPE:

                         m_faceName =  wxT("Courier");
                         m_faceName =  wxT("Courier");

-                        if ( m_style == wxITALIC && m_weight == wxNORMAL )
+                        if ( m_style == wxFONTSTYLE_ITALIC && m_weight == wxFONTWEIGHT_NORMAL )

                         {
                         {

-                            m_style = wxITALIC;
+                            m_style = wxFONTSTYLE_ITALIC;

                         }
                         break ;
 
                         }
                         break ;
 


@@ -406,17 +406,17 @@ void wxFontRefData::MacFindFont()
                 }
             }
 
                 }
             }
 

-            
+

             CTFontSymbolicTraits traits = 0;
 
             CTFontSymbolicTraits traits = 0;
 

-            if (m_weight == wxBOLD)
+            if (m_weight == wxFONTWEIGHT_BOLD)

                 traits |= kCTFontBoldTrait;
                 traits |= kCTFontBoldTrait;

-            if (m_style == wxITALIC || m_style == wxSLANT)
+            if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)

                 traits |= kCTFontItalicTrait;
                 traits |= kCTFontItalicTrait;

-     
+

             // use font caching
             wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_faceName.c_str(), traits, m_pointSize );
             // use font caching
             wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_faceName.c_str(), traits, m_pointSize );

-            
+

             static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ;
             m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];
             if ( !m_ctFont )
             static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ;
             m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];
             if ( !m_ctFont )


@@ -424,12 +424,12 @@ void wxFontRefData::MacFindFont()
                 // QD selection algorithm is the fastest by orders of magnitude on 10.5
                 if ( m_faceName.IsAscii() )
                 {
                 // QD selection algorithm is the fastest by orders of magnitude on 10.5
                 if ( m_faceName.IsAscii() )
                 {

-                    uint8 qdstyle = 0;
-                    if (m_weight == wxBOLD)
+                    uint8_t qdstyle = 0;
+                    if (m_weight == wxFONTWEIGHT_BOLD)

                         qdstyle |= bold;
                         qdstyle |= bold;

-                    if (m_style == wxITALIC || m_style == wxSLANT)
+                    if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)

                         qdstyle |= italic;
                         qdstyle |= italic;

-                    
+

                     Str255 qdFontName ;
                     wxMacStringToPascal( m_faceName , qdFontName );
                     m_ctFont.reset( CTFontCreateWithQuickdrawInstance(qdFontName, 0 , qdstyle, m_pointSize) );
                     Str255 qdFontName ;
                     wxMacStringToPascal( m_faceName , qdFontName );
                     m_ctFont.reset( CTFontCreateWithQuickdrawInstance(qdFontName, 0 , qdstyle, m_pointSize) );


@@ -454,7 +454,7 @@ void wxFontRefData::MacFindFont()
                         // TODO further fallbacks, synthesizing bold and italic, trying direct PostScript names etc
                     }
                 }
                         // TODO further fallbacks, synthesizing bold and italic, trying direct PostScript names etc
                     }
                 }

-                
+

                 fontcache[ std::wstring(lookupnameWithSize.wc_str()) ] = m_ctFont;
 #if 1 // debugging coretext font matching
                 CTFontSymbolicTraits received = CTFontGetSymbolicTraits( m_ctFont ) & 0x03;
                 fontcache[ std::wstring(lookupnameWithSize.wc_str()) ] = m_ctFont;
 #if 1 // debugging coretext font matching
                 CTFontSymbolicTraits received = CTFontGetSymbolicTraits( m_ctFont ) & 0x03;


@@ -466,12 +466,14 @@ void wxFontRefData::MacFindFont()
                     float floatnumber;
                     CFNumberGetValue( number, kCFNumberFloatType, &floatnumber );
                     {
                     float floatnumber;
                     CFNumberGetValue( number, kCFNumberFloatType, &floatnumber );
                     {

-                        printf( wxString::Format( "font %s expected %d but got %d traits, %f angle \n" , m_faceName.c_str(), traits, received, angle ) );
+                        wxString msg = wxString::Format( "font %s expected %d but got %d traits, %f angle \n" ,
+                                                         m_faceName.c_str(), traits, received, angle );
+                        printf( msg.c_str() );

                     }
                     CFShow( dict );
                     CFRelease( dict );
                 }
                     }
                     CFShow( dict );
                     CFRelease( dict );
                 }

-#endif  
+#endif

             }
 
         }
             }
 
         }


@@ -507,8 +509,8 @@ void wxFontRefData::MacFindFont()
             &fmfont ,
             &atsuSize ,
             &kHorizontal,
             &fmfont ,
             &atsuSize ,
             &kHorizontal,

-            (m_weight == wxBOLD) ? &kTrue : &kFalse ,
-            (m_style == wxITALIC || m_style == wxSLANT) ? &kTrue : &kFalse ,
+            (m_weight == wxFONTWEIGHT_BOLD) ? &kTrue : &kFalse ,
+            (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT) ? &kTrue : &kFalse ,

             (m_underlined) ? &kTrue : &kFalse ,
         };
 
             (m_underlined) ? &kTrue : &kFalse ,
         };
 


@@ -539,11 +541,11 @@ void wxFontRefData::MacFindFont()
             m_macFontStyle = style ;
             m_faceName = wxMacMakeStringFromPascal( qdFontName );
             if ( m_macFontStyle & bold )
             m_macFontStyle = style ;
             m_faceName = wxMacMakeStringFromPascal( qdFontName );
             if ( m_macFontStyle & bold )

-                m_weight = wxBOLD ;
+                m_weight = wxFONTWEIGHT_BOLD ;

             else
             else

-                m_weight = wxNORMAL ;
+                m_weight = wxFONTWEIGHT_NORMAL ;

             if ( m_macFontStyle & italic )
             if ( m_macFontStyle & italic )

-                m_style = wxITALIC ;
+                m_style = wxFONTSTYLE_ITALIC ;

             if ( m_macFontStyle & underline )
                 m_underlined = true ;
             m_pointSize = m_macFontSize ;
             if ( m_macFontStyle & underline )
                 m_underlined = true ;
             m_pointSize = m_macFontSize ;


@@ -553,7 +555,7 @@ void wxFontRefData::MacFindFont()
         {
             if ( m_faceName.empty() )
             {
         {
             if ( m_faceName.empty() )
             {

-                if ( m_family == wxDEFAULT )
+                if ( m_family == wxFONTFAMILY_DEFAULT )

                 {
                     m_macFontFamily = GetAppFont();
                     FMGetFontFamilyName(m_macFontFamily,qdFontName);
                 {
                     m_macFontFamily = GetAppFont();
                     FMGetFontFamilyName(m_macFontFamily,qdFontName);


@@ -563,18 +565,18 @@ void wxFontRefData::MacFindFont()
                 {
                     switch ( m_family )
                     {
                 {
                     switch ( m_family )
                     {

-                        case wxSCRIPT :
-                        case wxROMAN :
-                        case wxDECORATIVE :
+                        case wxFONTFAMILY_SCRIPT :
+                        case wxFONTFAMILY_ROMAN :
+                        case wxFONTFAMILY_DECORATIVE :

                             m_faceName = wxT("Times");
                             break ;
 
                             m_faceName = wxT("Times");
                             break ;
 

-                        case wxSWISS :
+                        case wxFONTFAMILY_SWISS :

                             m_faceName =  wxT("Helvetica");
                             break ;
 
                             m_faceName =  wxT("Helvetica");
                             break ;
 

-                        case wxMODERN :
-                        case wxTELETYPE:
+                        case wxFONTFAMILY_MODERN :
+                        case wxFONTFAMILY_TELETYPE:

                             m_faceName =  wxT("Courier");
                             break ;
 
                             m_faceName =  wxT("Courier");
                             break ;
 


@@ -612,9 +614,9 @@ void wxFontRefData::MacFindFont()
             }
 
             m_macFontStyle = 0;
             }
 
             m_macFontStyle = 0;

-            if (m_weight == wxBOLD)
+            if (m_weight == wxFONTWEIGHT_BOLD)

                 m_macFontStyle |= bold;
                 m_macFontStyle |= bold;

-            if (m_style == wxITALIC || m_style == wxSLANT)
+            if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)

                 m_macFontStyle |= italic;
             if (m_underlined)
                 m_macFontStyle |= underline;
                 m_macFontStyle |= italic;
             if (m_underlined)
                 m_macFontStyle |= underline;


@@ -709,12 +711,12 @@ wxFont::wxFont(const wxString& fontdesc)
 }
 
 bool wxFont::Create(int pointSize,
 }
 
 bool wxFont::Create(int pointSize,

-    int family,
-    int style,
-    int weight,
-    bool underlined,
-    const wxString& faceName,
-    wxFontEncoding encoding)
+                    wxFontFamily family,
+                    wxFontStyle style,
+                    wxFontWeight weight,
+                    bool underlined,
+                    const wxString& faceName,
+                    wxFontEncoding encoding)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -752,7 +754,7 @@ bool wxFont::MacCreateFromCTFontDescriptor( const void * ctFontDescriptor , int
 
 #endif
 
 
 #endif
 

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT

 bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
 {
 #if wxOSX_USE_CORE_TEXT
 bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
 {
 #if wxOSX_USE_CORE_TEXT


@@ -761,19 +763,17 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
         return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif
         return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif

-#if wxOSX_USE_ATSU_TEXT

     {
         UnRef();
 
         m_refData = new wxFontRefData(
     {
         UnRef();
 
         m_refData = new wxFontRefData(

-                                      12, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
+                                      12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,

                                       false, wxEmptyString, wxFONTENCODING_DEFAULT );
 
         M_FONTDATA->m_macThemeFontID = themeFontID ;
         RealizeResource();
         return true;
     }
                                       false, wxEmptyString, wxFONTENCODING_DEFAULT );
 
         M_FONTDATA->m_macThemeFontID = themeFontID ;
         RealizeResource();
         return true;
     }

-#endif

     return false;
 }
 #endif
     return false;
 }
 #endif


@@ -820,7 +820,7 @@ wxGDIRefData *wxFont::CreateGDIRefData() const
 
 wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data));
+    return new wxFontRefData(*static_cast<const wxFontRefData *>(data));

 }
 
 void wxFont::SetPointSize(int pointSize)
 }
 
 void wxFont::SetPointSize(int pointSize)


@@ -835,7 +835,7 @@ void wxFont::SetPointSize(int pointSize)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -844,7 +844,7 @@ void wxFont::SetFamily(int family)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -853,7 +853,7 @@ void wxFont::SetStyle(int style)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -919,23 +919,23 @@ wxSize wxFont::GetPixelSize() const
 #endif
 }
 
 #endif
 }
 

-int wxFont::GetFamily() const
+wxFontFamily wxFont::GetFamily() const

 {
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , wxFONTFAMILY_MAX, wxT("invalid font") );

 
     return M_FONTDATA->GetFamily();
 }
 
 
     return M_FONTDATA->GetFamily();
 }
 

-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const

 {
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , wxFONTSTYLE_MAX, wxT("invalid font") );

 
     return M_FONTDATA->GetStyle() ;
 }
 
 
     return M_FONTDATA->GetStyle() ;
 }
 

-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const

 {
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , wxFONTWEIGHT_MAX, wxT("invalid font") );

 
     return M_FONTDATA->GetWeight();
 }
 
     return M_FONTDATA->GetWeight();
 }