rewrite using type safe wxHashMap instead of wxObject-based wxHashTable

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index a306601251fd6a24aa8b9d57a4cdd1eab4cc6c5e..0f599670849745359ba59f0dc76951952d816ac0 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.h
+// Name:        wx/os2/font.h

 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:


@@ -14,32 +14,28 @@
 
 #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;
+WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString;

 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE 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,16 +82,15 @@ 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 SetStyle(int nStyle);
     virtual void SetWeight(int nWeight);
 
     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);
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);

-    virtual void SetNativeFontInfo(const wxNativeFontInfo& rInfo);

 
     //
     // For internal use only!
 
     //
     // For internal use only!


@@ -117,16 +105,17 @@ public:
     //
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);
     //
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);

-    virtual WXHANDLE GetResourceHandle(void);
-    virtual bool     FreeResource(bool bForce = FALSE);
+    virtual WXHANDLE GetResourceHandle(void) const;
+    virtual bool     FreeResource(bool bForce = false);

 
     WXHFONT GetHFONT(void) const;
 
     WXHFONT GetHFONT(void) const;

+

 protected:
 protected:

-    //
-    // Common part of all ctors
-    //
-    void Init(void);
-    void Unshare(void);
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
+
+    // implement wxObject virtuals which are used by AllocExclusive()
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)