X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3437beb5d119ef51d058a35ef8933b412f77576..ec8565f3c5d1df72267cb1e3375789090ac091da:/include/wx/mgl/font.h?ds=sidebyside diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h index 4aed3d6dfb..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 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "font.h" #endif @@ -81,6 +81,7 @@ 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); @@ -90,17 +91,16 @@ 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() {} + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxFont) };