Avoid duplicated definition errors for wxLongToLongHashMap when both

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index e9bbad3fb13d2cea70b23151e2024fdf1729e32c..ae111492dbbb6b9368af6cfb8feb26550901dd43 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -25,9 +25,6 @@
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 

-WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
-                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
-

 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index cfa4ceaad406d91e02897b781f8f22484f464f5c..0f458be80319633bbbea5908741dfcc2daa614ff 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -81,9 +81,6 @@ class WXDLLEXPORT wxComboBox;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxSpinCtrl;
 
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxSpinCtrl;
 

-WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
-                               wxLongToLongHashMap, class WXDLLIMPEXP_ADV );
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index a418d7be6100efc54c369a6149dfcfc4eec31543..ee6c1420325936b813d9c7000a717bde0a164568 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -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_