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

Avoid duplicated definition errors for wxLongToLongHashMap when both

Browse Source 
grid.h and fs_zip.h are included.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-10 20:50:28 +00:00
parent ae360bed6e
commit 0fab3a5a1a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/fs_zip.h
View File

@@ -25,9 +25,6 @@
#include "wx/filesys.h" #include "wx/filesys.h"
#include "wx/hashmap.h" #include "wx/hashmap.h"
WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxZipFSHandler // wxZipFSHandler
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

3
include/wx/generic/grid.h
View File

@@ -81,9 +81,6 @@ class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxSpinCtrl; class WXDLLEXPORT wxSpinCtrl;
WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
wxLongToLongHashMap, class WXDLLIMPEXP_ADV );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// macros // macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
include/wx/hashmap.h
View File

@@ -655,5 +655,12 @@ public: \
(hashmap).clear(); \ (hashmap).clear(); \
} }
//---------------------------------------------------------------------------
// Declarations of common hashmap classes
WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
#endif // _WX_HASHMAP_H_ #endif // _WX_HASHMAP_H_