added wxIconLocation; minor fixes to wxIcon on some platforms

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

diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index 335c54636be8eb7cdc13f6c4e214e11da3ea7b83..e4a56a874b48a324719427f06298905b7d0b9b92 100644 (file)
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -2,7 +2,7 @@
 // Name:        font.h
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -67,7 +67,7 @@ public:
 
     bool Create(const wxNativeFontInfo& fontinfo);
 
-    ~wxFont();
+    ~wxFont() {}
 
     // assignment
     wxFont& operator=(const wxFont& font);
@@ -80,6 +80,7 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
+    virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
@@ -89,16 +90,15 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
-    // implementation from now on
-    void Unshare();
-
     struct font_t *GetMGLfont_t(float scale, bool antialiased);
 
-    // no data :-)
-
 protected:
     // common part of all ctors
-    void Init();
+    void Init() {}
+
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)