revert forward declaration of hashmap, it doesn't work with STL

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 0c27e93a9b971a42d972acf70bd6d5e6ea47a9d0..16888e6ae5686270faad941984d0ef67352767e9 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -20,6 +20,7 @@
 #include "wx/list.h"
 #include "wx/string.h"
 #include "wx/fontenc.h"
+#include "wx/hashmap.h"
 #include "wx/math.h"
 
 // ---------------------------------------------------------------------------
@@ -36,7 +37,6 @@ class WXDLLIMPEXP_CORE wxPalette;
 class WXDLLIMPEXP_CORE wxPen;
 class WXDLLIMPEXP_CORE wxRegion;
 class WXDLLIMPEXP_BASE wxString;
-class wxStringToColourHashMap;
 
 // ---------------------------------------------------------------------------
 // constants
@@ -494,6 +494,8 @@ public:
 #endif
 };
 
+WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
+
 class WXDLLEXPORT wxColourDatabase
 {
 public:

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 6d3faf11f71f5fc4cc4b715e0f23bc966a2b99ae..512fa5e23ea53d66400e2b28a10c804796f7d665 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,7 +31,6 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 #include "wx/font.h"
-#include "wx/hashmap.h"
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
@@ -50,8 +49,6 @@ WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
 WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
 #endif
 
-WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
-
 const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
 const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);