X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d7ee9e860187240a5f82ec4489c831f894065f2..dc484d491b15355285a89da275c58c2ef247d1f4:/include/wx/mgl/font.h

diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index 0fcb960dd2..75fd7e9aaa 100644
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -2,17 +2,13 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FONT_H__
 #define __WX_FONT_H__
 
-#ifdef __GNUG__
-    #pragma interface "font.h"
-#endif
-
 #include "wx/hash.h"
 
 // ----------------------------------------------------------------------------
@@ -34,13 +30,10 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont() { }
 
     wxFont(const wxNativeFontInfo& info)
     {
-        Init();
-
         (void)Create(info);  
     }
 
@@ -52,8 +45,6 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
@@ -67,10 +58,7 @@ public:
 
     bool Create(const wxNativeFontInfo& fontinfo);
 
-    ~wxFont() {}
-
-    // assignment
-    wxFont& operator=(const wxFont& font);
+    virtual ~wxFont() {}
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
@@ -81,21 +69,19 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool IsFixedWidth() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
-    virtual void SetFaceName(const wxString& faceName);
+    virtual bool SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     struct font_t *GetMGLfont_t(float scale, bool antialiased);
 
 protected:
-    // common part of all ctors
-    void Init() {}
-
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;