Fixed bug introduced in fs_zip.cpp when replacing wxHashTableLong

with wxHashMap.
  Made wxHashMap constructor explicit to prevent similar errors.

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 0502f6a27acbc21467fc61641e738830c41dcf68..3f2e00897691fd4a545cdb9a92c2ab57b25f8a04 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -525,8 +525,10 @@ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \
 public: \
     typedef VALUE_T mapped_type; \
  \
 public: \
     typedef VALUE_T mapped_type; \
  \

-    CLASSNAME( size_type hint = 100, hasher hf = hasher(), key_equal eq = key_equal() ) \
-        : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq, CLASSNAME##_wxImplementation_KeyEx() ) {} \
+    wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(),        \
+                          key_equal eq = key_equal() )                       \
+        : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq,              \
+                                   CLASSNAME##_wxImplementation_KeyEx() ) {} \

  \
     mapped_type& operator[]( const const_key_type& key ) \
     { \
  \
     mapped_type& operator[]( const const_key_type& key ) \
     { \

diff --git a/include/wx/hashset.h b/include/wx/hashset.h
index 4e40bb7698a61e6b402b6fc7ee95cf8729c3f4a2..83cd9861e1235eeccb8030d72f1ab89b6cae9bda 100644 (file)
--- a/include/wx/hashset.h
+++ b/include/wx/hashset.h
@@ -38,8 +38,8 @@ _WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx,
 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable             \
 {                                                                            \
 public:                                                                      \
 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable             \
 {                                                                            \
 public:                                                                      \

-    CLASSNAME( size_type hint = 100, hasher hf = hasher(),                   \
-               key_equal eq = key_equal() )                                  \
+    wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(),        \
+                          key_equal eq = key_equal() )                       \

         : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq,              \
                       CLASSNAME##_wxImplementation_KeyEx() ) {}              \
                                                                              \
         : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq,              \
                       CLASSNAME##_wxImplementation_KeyEx() ) {}              \
                                                                              \

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index f3e807d87c7d590cac1a80c4cd69135a25e5b9da..bb449aab85aaf358a9afbdba6819ba4769eddad6 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -208,7 +208,7 @@ wxString wxZipFSHandler::DoFind()
                 wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
                 if (it == m_DirsFound->end())
                 {
                 wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
                 if (it == m_DirsFound->end())
                 {

-                    m_DirsFound[key] = 1;
+                    (*m_DirsFound)[key] = 1;

                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 9f7a7a496b815a85227784d44e8cb7ec98218b92..1b90d1ad26f903e49c9ce7aae63a10aebb93a60c 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3850,8 +3850,8 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id,
                                   style | wxWANTS_CHARS , name))
         return FALSE;
 
                                   style | wxWANTS_CHARS , name))
         return FALSE;
 

-    m_colMinWidths =GRID_HASH_SIZE ;
-    m_rowMinHeights = GRID_HASH_SIZE ;
+    m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+    m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;

 
     Create() ;
 
 
     Create() ;