X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/mgl/font.h?ds=sidebyside diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h index 6a105bf6fc..a8f9a25fbe 100644 --- a/include/wx/mgl/font.h +++ b/include/wx/mgl/font.h @@ -9,20 +9,16 @@ #ifndef __WX_FONT_H__ #define __WX_FONT_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "font.h" -#endif - #include "wx/hash.h" // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDC; -class WXDLLEXPORT wxPaintDC; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxFont; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxPaintDC; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxFont; struct font_t; @@ -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; @@ -87,16 +75,17 @@ public: 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); + // Unofficial API, don't use + virtual void SetNoAntiAliasing(bool no = true); + virtual bool GetNoAntiAliasing() const; + 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;