call gtk_toolbar_set_tooltips() from GtkSetStyle(); removed erroneous wxTB_TOOLTIPS

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index ebbc7fa58d6452fb2f7072e976ba3bb39d50dd95..9a538b0fd98f5dee16a2aef2d0a1f99ff761ee4a 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hash.cpp
+// Name:        src/common/hash.cpp

 // Purpose:     wxHashTable implementation
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Purpose:     wxHashTable implementation
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()


@@ -21,15 +21,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/list.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"

 #endif
 
 #endif
 

-#include "wx/hash.h"
-

 #if wxUSE_OLD_HASH_TABLE
 
 #include <string.h>
 #if wxUSE_OLD_HASH_TABLE
 
 #include <string.h>


@@ -1036,7 +1035,7 @@ void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
 {
     Create( m_keyType, m_size );
 
 {
     Create( m_keyType, m_size );
 

-    wxASSERT( false );
+    wxFAIL;

 }
 
 void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
 }
 
 void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )