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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-29 06:52:46 +00:00
parent f8ba4cb61a
commit f79f1604a0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gdicmn.h
View File

@@ -20,6 +20,7 @@
#include "wx/list.h" #include "wx/list.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/fontenc.h" #include "wx/fontenc.h"
#include "wx/hashmap.h"
#include "wx/math.h" #include "wx/math.h"
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -36,7 +37,6 @@ class WXDLLIMPEXP_CORE wxPalette;
class WXDLLIMPEXP_CORE wxPen; class WXDLLIMPEXP_CORE wxPen;
class WXDLLIMPEXP_CORE wxRegion; class WXDLLIMPEXP_CORE wxRegion;
class WXDLLIMPEXP_BASE wxString; class WXDLLIMPEXP_BASE wxString;
class wxStringToColourHashMap;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// constants // constants
@@ -494,6 +494,8 @@ public:
#endif #endif
}; };
WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
class WXDLLEXPORT wxColourDatabase class WXDLLEXPORT wxColourDatabase
{ {
public: public:

3
src/common/gdicmn.cpp
View File

@@ -31,7 +31,6 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/hashmap.h"
WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;
@@ -50,8 +49,6 @@ WXDLLIMPEXP_DATA_CORE(wxPen) wxNullPen;
WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette; WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
#endif #endif
WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord); const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord); const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);