X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73302af6dddd667af4ebec69c800bc9de106f28e..120678ee96cd38c8d10ead6e60135004b8e97f9e:/src/common/fmapbase.cpp diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 759c7541eb..e473054fe8 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -199,7 +199,7 @@ class wxFontMapperModule : public wxModule public: wxFontMapperModule() : wxModule() { } virtual bool OnInit() { return true; } - virtual void OnExit() { delete wxFontMapperBase::Set(NULL); } + virtual void OnExit() { delete (wxFontMapperBase*)wxFontMapperBase::Set(NULL); } DECLARE_DYNAMIC_CLASS(wxFontMapperModule) }; @@ -233,11 +233,10 @@ wxFontMapperBase::~wxFontMapperBase() #endif // wxUSE_CONFIG } +bool wxFontMapperBase::IsWxFontMapper() +{ return false; } + /* static */ -// Declared as returning wxFontMapper when wxUSE_GUI=1. Unfortunately, it's -// only implemented in wxBase library. Note that if the last resort -// is taken and GUI code tries to treat it as a real wxFontMapper -// then you'd be in trouble. wxFontMapperBase *wxFontMapperBase::Get() { if ( !sm_instance )