]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/font.cpp
use wxVector<T> instead of OBJARRAY macros for wxHtmlTextPieces (slightly better...
[wxWidgets.git] / src / os2 / font.cpp
index 61db53360615337b4be49fb4a8337a3e6ea41a56..4ed240007ce5cbb5e45fa9581e478c58cb9d1b74 100644 (file)
@@ -297,7 +297,7 @@ protected:
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 
-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ============================================================================
 // implementation
@@ -857,7 +857,7 @@ wxString wxNativeFontInfo::ToString() const
                 fa.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,
-                fa.szFacename);
+                (char *)fa.szFacename);
     return sStr;
 } // end of wxNativeFontInfo::ToString