X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc95f4f9477e96ac2ce9a18f410ef98a169a75a6..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/os2/font.h

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 6cad73deff..314d445d7b 100644
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -14,7 +14,6 @@
 
 #include "wx/gdiobj.h"
 #include "wx/os2/private.h"
-#include "wx/fontutil.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
@@ -33,7 +32,7 @@ public:
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight
-           ,bool            bUnderlined = FALSE
+           ,bool            bUnderlined = false
            ,const wxString& rsFace = wxEmptyString
            ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
           )
@@ -68,7 +67,7 @@ public:
                 ,int             nFamily
                 ,int             nStyle
                 ,int             nWeight
-                ,bool            bUnderlined = FALSE
+                ,bool            bUnderlined = false
                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );
@@ -93,7 +92,7 @@ public:
     virtual bool              GetUnderlined(void) const;
     virtual wxString          GetFaceName(void) const;
     virtual wxFontEncoding    GetEncoding(void) const;
-    virtual wxNativeFontInfo* GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo* GetNativeFontInfo() const;
 
     virtual void SetPointSize(int nPointSize);
     virtual void SetFamily(int nFamily);
@@ -102,11 +101,11 @@ public:
     virtual void SetFaceName(const wxString& rsFaceName);
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);
-    virtual void SetNativeFontInfo(const wxNativeFontInfo& rInfo);
 
     //
     // For internal use only!
     //
+    void SetPS(HPS hPS);
     void SetFM( PFONTMETRICS pFM
                ,int          nNumFonts
               );
@@ -117,10 +116,13 @@ public:
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);
     virtual WXHANDLE GetResourceHandle(void);
-    virtual bool     FreeResource(bool bForce = FALSE);
+    virtual bool     FreeResource(bool bForce = false);
 
     WXHFONT GetHFONT(void) const;
+
 protected:
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
+
     //
     // Common part of all ctors
     //