Avoid conflict between new transparency API and old background support.

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

diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index 1c7fa790f6d6f846b6fdfb72caad24cf5ef94b5a..3f748c413a847e7dd66f1ebb7294285caa84b4bd 100644 (file)
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -30,13 +30,10 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

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

 
     wxFont(const wxNativeFontInfo& info)
     {
 
     wxFont(const wxNativeFontInfo& info)
     {

-        Init();
-

         (void)Create(info);  
     }
 
         (void)Create(info);  
     }
 


@@ -48,8 +45,6 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-

         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 


@@ -65,9 +60,6 @@ public:
 
     ~wxFont() {}
 
 
     ~wxFont() {}
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
-

     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;


@@ -83,16 +75,13 @@ public:
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
     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:
     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;
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;