X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85ab460e7d62b52b105b3dc0bbdd36cebc14fb4b..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/os2/font.h diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h index 08e7ade7e3..0f59967084 100644 --- a/include/wx/os2/font.h +++ b/include/wx/os2/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/os2/font.h // Purpose: wxFont class // Author: David Webster // Modified by: @@ -15,13 +15,13 @@ #include "wx/gdiobj.h" #include "wx/os2/private.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString; // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such @@ -105,7 +105,7 @@ public: // virtual bool IsFree(void) const; virtual bool RealizeResource(void); - virtual WXHANDLE GetResourceHandle(void); + virtual WXHANDLE GetResourceHandle(void) const; virtual bool FreeResource(bool bForce = false); WXHFONT GetHFONT(void) const; @@ -113,7 +113,9 @@ public: protected: virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo); - void Unshare(void); + // implement wxObject virtuals which are used by AllocExclusive() + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxFont)