miscellaneous wxFont enhancements (patch 1496606):

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 53dcf28490837a5090b5ecbe6b1c07229914b6cf..08e7ade7e3082f4027fdc16286ea6bb742f9d8ec 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/fontutil.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
@@ -26,20 +25,17 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& rFont) { Init(); Ref(rFont); }
+    wxFont() { }
 
     wxFont( int             nSize
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight
-           ,bool            bUnderlined = FALSE
+           ,bool            bUnderlined = false
            ,const wxString& rsFace = wxEmptyString
            ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
           )
     {
-        Init();
-
         (void)Create( nSize
                      ,nFamily
                      ,nStyle
@@ -55,8 +51,6 @@ public:
           )
 
     {
-        Init();
-
         (void)Create( rInfo
                      ,hFont
                     );
@@ -68,7 +62,7 @@ public:
                 ,int             nFamily
                 ,int             nStyle
                 ,int             nWeight
-                ,bool            bUnderlined = FALSE
+                ,bool            bUnderlined = false
                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );
@@ -78,11 +72,6 @@ public:
 
     virtual ~wxFont();
 
-    //
-    // Assignment
-    //
-    wxFont& operator=(const wxFont& rFont);
-
     //
     // Implement base class pure virtuals
     //
@@ -93,13 +82,13 @@ 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);
     virtual void SetStyle(int nStyle);
     virtual void SetWeight(int nWeight);
-    virtual void SetFaceName(const wxString& rsFaceName);
+    virtual bool SetFaceName(const wxString& rsFaceName);
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);
 
@@ -117,17 +106,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
-    //
-    void Init(void);
     void Unshare(void);
 
 private: