use wxVector<T> instead of OBJARRAY macros for wxHtmlTextPieces (slightly better...

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 9871769c778a7b82cb6a8cb7dcd53d3fd8b1c5b2..4ed240007ce5cbb5e45fa9581e478c58cb9d1b74 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -20,12 +20,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/font.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
@@ -50,7 +51,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
-        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
+        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 
@@ -296,6 +297,8 @@ protected:
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -854,7 +857,7 @@ wxString wxNativeFontInfo::ToString() const
                 fa.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,
-                fa.szFacename);
+                (char *)fa.szFacename);
     return sStr;
 } // end of wxNativeFontInfo::ToString
 
@@ -947,7 +950,7 @@ bool wxFont::FreeResource( bool WXUNUSED(bForce) )
     return false;
 } // end of wxFont::FreeResource
 
-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const
 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle
@@ -1135,19 +1138,14 @@ const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
 //
 // Internal use only method to set the FONTMETRICS array
 //
-void wxFont::SetFM(
-  PFONTMETRICS                      pFM
-, int                               nNumFonts
-)
+void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts )
 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 
-void wxFont::SetPS(
-  HPS                               hPS
-)
+void wxFont::SetPS( HPS hPS )
 {
     Unshare();