X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..6def7a17b01a15e68696a1863d114ecc5554e3d4:/include/wx/mgl/font.h diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h index 3929e5f959..6a105bf6fc 100644 --- a/include/wx/mgl/font.h +++ b/include/wx/mgl/font.h @@ -2,14 +2,14 @@ // Name: font.h // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001, Vaclav Slavik +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_FONT_H__ #define __WX_FONT_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "font.h" #endif @@ -67,7 +67,7 @@ public: bool Create(const wxNativeFontInfo& fontinfo); - ~wxFont(); + ~wxFont() {} // assignment wxFont& operator=(const wxFont& font); @@ -80,6 +80,8 @@ public: virtual wxString GetFaceName() const; 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); @@ -89,16 +91,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)