Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If a base font mapper object was created prematurely before the traints

Browse Source 
object was created, delete it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-06-06 11:02:09 +00:00
parent fec9cc08e7
commit 62ad77afbd
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/init.cpp
View File

@@ -36,6 +36,9 @@
#include "wx/ptr_scpd.h" #include "wx/ptr_scpd.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/except.h" #include "wx/except.h"
#if wxUSE_FONTMAP
#include "wx/fontmap.h"
#endif
#if defined(__WXMSW__) && defined(__WXDEBUG__) #if defined(__WXMSW__) && defined(__WXDEBUG__)
#include "wx/msw/msvcrt.h" #include "wx/msw/msvcrt.h"
@@ -449,6 +452,13 @@ int wxEntry(int& argc, char **argv)
{ {
ConvertArgsToUnicode(argc, 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); return wxEntry(argc, gs_initData.argv);
} }