fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 94ec7c7bbb52de58801e0e95788c7612df0ef49f..314d445d7bd9ce74f2456d116bbe04ea71fcc050 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -32,38 +32,48 @@ public:
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight

-           ,bool            bUnderlined = FALSE
+           ,bool            bUnderlined = false

            ,const wxString& rsFace = wxEmptyString
            ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
           )
     {
         Init();
 
            ,const wxString& rsFace = wxEmptyString
            ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
           )
     {
         Init();
 

-        (void)Create(nSize, nFamily, nStyle, nWeight, bUnderlined, rsFace, vEncoding);
+        (void)Create( nSize
+                     ,nFamily
+                     ,nStyle
+                     ,nWeight
+                     ,bUnderlined
+                     ,rsFace
+                     ,vEncoding
+                    );

     }
 
     }
 

-    wxFont(const wxNativeFontInfo& rInfo)
+    wxFont( const wxNativeFontInfo& rInfo
+           ,WXHFONT                 hFont = 0
+          )
+

     {
         Init();
 
     {
         Init();
 

-        (void)Create( rInfo.pointSize
-                     ,rInfo.family
-                     ,rInfo.style
-                     ,rInfo.weight
-                     ,rInfo.underlined
-                     ,rInfo.faceName
-                     ,rInfo.encoding
+        (void)Create( rInfo
+                     ,hFont

                     );
     }
 
                     );
     }
 

+    wxFont(const wxString& rsFontDesc);
+

     bool Create( int             nSize
                 ,int             nFamily
                 ,int             nStyle
                 ,int             nWeight
     bool Create( int             nSize
                 ,int             nFamily
                 ,int             nStyle
                 ,int             nWeight

-                ,bool            bUnderlined = FALSE
+                ,bool            bUnderlined = false

                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );
                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );

+    bool Create( const wxNativeFontInfo& rInfo
+                ,WXHFONT                 hFont = 0
+               );

 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 


@@ -75,14 +85,14 @@ public:
     //
     // Implement base class pure virtuals
     //
     //
     // Implement base class pure virtuals
     //

-    virtual int            GetPointSize(void) const;
-    virtual int            GetFamily(void) const;
-    virtual int            GetStyle(void) const;
-    virtual int            GetWeight(void) const;
-    virtual bool           GetUnderlined(void) const;
-    virtual wxString       GetFaceName(void) const;
-    virtual wxFontEncoding GetEncoding(void) const;
-    virtual HPS            GetPS(void) const;
+    virtual int               GetPointSize(void) const;
+    virtual int               GetFamily(void) const;
+    virtual int               GetStyle(void) const;
+    virtual int               GetWeight(void) const;
+    virtual bool              GetUnderlined(void) const;
+    virtual wxString          GetFaceName(void) const;
+    virtual wxFontEncoding    GetEncoding(void) const;
+    virtual const wxNativeFontInfo* GetNativeFontInfo() const;

 
     virtual void SetPointSize(int nPointSize);
     virtual void SetFamily(int nFamily);
 
     virtual void SetPointSize(int nPointSize);
     virtual void SetFamily(int nFamily);


@@ -91,22 +101,28 @@ 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 SetPS(HPS hPS);
-    virtual void SetFM( PFONTMETRICS pFM
-                       ,int          nNumFonts
-                      );

 
 

+    //
+    // For internal use only!
+    //
+    void SetPS(HPS hPS);
+    void SetFM( PFONTMETRICS pFM
+               ,int          nNumFonts
+              );

     //
     // Implementation only from now on
     // -------------------------------
     //
     //
     // Implementation only from now on
     // -------------------------------
     //

-    int              GetFontId(void) const;

     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);
     virtual WXHANDLE GetResourceHandle(void);
     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:
 
 protected:

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

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


@@ -114,8 +130,6 @@ protected:
     void Unshare(void);
 
 private:
     void Unshare(void);
 
 private:

-    void OS2SelectMatchingFontByName(void);
-

     DECLARE_DYNAMIC_CLASS(wxFont)
 }; // end of wxFont
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 }; // end of wxFont