Added wxTB_NODIVIDER and wxTB_NOALIGN so native Windows toolbar can

used in FL.
Adjusted Windows toolbar height for wxTB_NODIVIDER style.
Removed some false memory leak reporting from fontmap.cpp, mimecmn.cpp,
strconv.cpp.
Added and used MapBitmap function in newbmpbtn.cpp so the right
colours are used under Windows.
<controversial>Added iniconf.cpp to WIN32 compilation</conroversial>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/fontmap.cpp

@@ -36,6 +36,7 @@
     #include "wx/intl.h"
 #endif // PCH
 
+#include "wx/module.h"
 #include "wx/fontmap.h"
 
 #if wxUSE_CONFIG
@@ -181,11 +182,23 @@ static const wxChar* gs_encodingNames[] =
 // global data
 // ----------------------------------------------------------------------------
 
-// private object
-static wxFontMapper gs_fontMapper;
+wxFontMapper * wxTheFontMapper = NULL;
 
-// and public pointer
-wxFontMapper * wxTheFontMapper = &gs_fontMapper;
+class wxFontMapperModule: public wxModule
+{
+public:
+    wxFontMapperModule() : wxModule() { }
+    virtual bool OnInit() { wxTheFontMapper = new wxFontMapper; return TRUE; }
+    virtual void OnExit()
+    {
+        delete wxTheFontMapper;
+        wxTheFontMapper = NULL;
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontMapperModule, wxModule)
 
 // ----------------------------------------------------------------------------
 // private classes