1. renamed wxFontMapper::IsWxFontMapper() to IsDummy() (with reverse semantics)

2. added wxFontMapper::Reset() to only do the cast needed when deleting
   the font mapper object once
3. reset the dummy font mapper created during the app initialization in
   wxFontMapperModule and not in init.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-06-07 17:49:27 +00:00
parent 4e3e485bc8
commit d5bfbd9ab8
4 changed files with 49 additions and 29 deletions

View File

@@ -36,9 +36,6 @@
#include "wx/ptr_scpd.h"
#include "wx/module.h"
#include "wx/except.h"
#if wxUSE_FONTMAP
#include "wx/fontmap.h"
#endif
#if defined(__WXMSW__) && defined(__WXDEBUG__)
#include "wx/msw/msvcrt.h"
@@ -452,13 +449,6 @@ int wxEntry(int& argc, char **argv)
{
ConvertArgsToUnicode(argc, argv);
#if wxUSE_FONTMAP
// If we created a font mapper during the above call,
// it will only be the base class, so delete it to allow
// app traits to create mapper.
delete (wxFontMapperBase*) wxFontMapperBase::Set(NULL);
#endif
return wxEntry(argc, gs_initData.argv);
}