blind fix for wxGIFDecoder::ReadGIF

[wxWidgets.git] / src / mac / font.cpp

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index ecffc9fd941d59244dc5d710d92340b785981080..d425b3cf95f1718e3cfd96704a48c1019afaface 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -16,7 +16,9 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"

+#include "wx/fontutil.h"

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

+#include "wx/utils.h"

 
 #include "wx/fontutil.h"
 
 
 #include "wx/fontutil.h"
 


@@ -93,9 +95,13 @@ void wxFontRefData::MacFindFont()
                        m_macFontNum = ::GetAppFont() ;
                else
                {
                        m_macFontNum = ::GetAppFont() ;
                else
                {

-                       strcpy(wxBuffer, m_faceName);
-                       C2PStr(wxBuffer);
-                       ::GetFNum( (unsigned char*) wxBuffer, &m_macFontNum);
+#if TARGET_CARBON
+                       c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
+#else
+                       strcpy( (char *) wxBuffer, m_faceName ) ;
+                       c2pstr( (char *) wxBuffer ) ;
+#endif
+                       ::GetFNum( (StringPtr) wxBuffer, &m_macFontNum);

                }
        }
 
                }
        }
 


@@ -119,6 +125,12 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
         wxTheFontList->Append(this);
 }
 

+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
+}
+

 wxFont::wxFont(const wxString& fontdesc)
 {
     wxNativeFontInfo info;
 wxFont::wxFont(const wxString& fontdesc)
 {
     wxNativeFontInfo info;


@@ -143,12 +155,6 @@ bool wxFont::Create(int pointSize,
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxFont::Create(const wxNativeFontInfo& info)
-{
-    return Create(info.pointSize, info.family, info.style, info.weight,
-                  info.underlined, info.faceName, info.encoding);
-}
-

 wxFont::~wxFont()
 {
     if (wxTheFontList)
 wxFont::~wxFont()
 {
     if (wxTheFontList)