Applied [ 716064 ] Second part of wxFileCtrl & wxDirCtrl patch

[wxWidgets.git] / include / wx / os2 / font.h

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 6cad73deffa9d2e840c3f9d4396f53c072bc100b..53dcf28490837a5090b5ecbe6b1c07229914b6cf 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -102,11 +102,11 @@ public:
     virtual void SetFaceName(const wxString& rsFaceName);
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);
     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!
     //
 
     //
     // For internal use only!
     //

+    void SetPS(HPS hPS);

     void SetFM( PFONTMETRICS pFM
                ,int          nNumFonts
               );
     void SetFM( PFONTMETRICS pFM
                ,int          nNumFonts
               );


@@ -120,7 +120,10 @@ public:
     virtual bool     FreeResource(bool bForce = FALSE);
 
     WXHFONT GetHFONT(void) const;
     virtual bool     FreeResource(bool bForce = FALSE);
 
     WXHFONT GetHFONT(void) const;

+

 protected:
 protected:

+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
+

     //
     // Common part of all ctors
     //
     //
     // Common part of all ctors
     //