bitmap button size was too small when uxtheme functions were used to get the margins

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 86741978f9c881db6934a61acf383785a20c098d..b01d39cd9be6d3790f7a78ddb1748160f7eddf89 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/init.cpp
+// Name:        src/common/init.cpp
 // Purpose:     initialisation for the library
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -20,7 +20,7 @@
 #include "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
@@ -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);
 }