added generic color dialog to setup

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 79d93657fbd3ed0f76f3c06d3e209219ccab2817..d425b3cf95f1718e3cfd96704a48c1019afaface 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -18,6 +18,7 @@
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"

+#include "wx/utils.h"

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


@@ -94,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);

                }
        }
 
                }
        }