Better backward compatibility and deprecation markup for interface deprecated in...

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 6cad73deffa9d2e840c3f9d4396f53c072bc100b..ba851805133f61fdd7ab82fae6dcb60be42e59f8 100644 (file)
--- 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/gdiobj.h"
 #include "wx/os2/private.h"

-#include "wx/fontutil.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 


@@ -26,20 +25,17 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& rFont) { Init(); Ref(rFont); }
+    wxFont() { }

 
     wxFont( int             nSize
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight
 
     wxFont( 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
           )
     {

-        Init();
-

         (void)Create( nSize
                      ,nFamily
                      ,nStyle
         (void)Create( nSize
                      ,nFamily
                      ,nStyle


@@ -55,8 +51,6 @@ public:
           )
 
     {
           )
 
     {

-        Init();
-

         (void)Create( rInfo
                      ,hFont
                     );
         (void)Create( rInfo
                      ,hFont
                     );


@@ -68,7 +62,7 @@ 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
                );
                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );


@@ -78,11 +72,6 @@ public:
 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 

-    //
-    // Assignment
-    //
-    wxFont& operator=(const wxFont& rFont);
-

     //
     // Implement base class pure virtuals
     //
     //
     // Implement base class pure virtuals
     //


@@ -93,7 +82,7 @@ public:
     virtual bool              GetUnderlined(void) const;
     virtual wxString          GetFaceName(void) const;
     virtual wxFontEncoding    GetEncoding(void) const;
     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);
 
     virtual void SetPointSize(int nPointSize);
     virtual void SetFamily(int nFamily);


@@ -102,11 +91,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
               );


@@ -117,14 +106,13 @@ public:
     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;
 
     WXHFONT GetHFONT(void) const;

+

 protected:
 protected:

-    //
-    // Common part of all ctors
-    //
-    void Init(void);
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
+

     void Unshare(void);
 
 private:
     void Unshare(void);
 
 private: