Ignore non-existant string selection in wxComboBox::SetValue() in read-only mode...

[wxWidgets.git] / src / common / hashmap.cpp

diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp
index e3742aed7c0755c4d7cc6356d2c81bdb0c728c54..66f14e5815320eb9237e82135b4fb140fff23433 100644 (file)
--- a/src/common/hashmap.cpp
+++ b/src/common/hashmap.cpp
@@ -46,7 +46,7 @@ unsigned long wxStringHash::stringHash( const wchar_t* k )
   { return DoStringHash(k); }
 
 
   { return DoStringHash(k); }
 
 

-#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+#ifdef wxNEEDS_WX_HASH_MAP

 
 /* from SGI STL */
 const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
 
 /* from SGI STL */
 const unsigned long _wxHashTableBase2::ms_primes[prime_count] =


@@ -70,7 +70,7 @@ unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
     }
 
     /* someone might try to alloc a 2^32-element hash table */
     }
 
     /* someone might try to alloc a 2^32-element hash table */

-    wxFAIL_MSG( _T("hash table too big?") );
+    wxFAIL_MSG( wxT("hash table too big?") );

 
     /* quiet warning */
     return 0;
 
     /* quiet warning */
     return 0;


@@ -139,4 +139,4 @@ _wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase
     return node;
 }
 
     return node;
 }
 

-#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+#endif // wxNEEDS_WX_HASH_MAP