wxDialogBase only has one ctor, so just do initialization in ctor instead of Init()

[wxWidgets.git] / include / wx / hash.h

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 3eb539e9d38b47fbf1955fe08e17008265895cc9..452040ba31f3e1407c50c45cdb65a6aba23f2c72 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -15,7 +14,7 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

     #include "wx/object.h"
 #else
     class WXDLLIMPEXP_FWD_BASE wxObject;
     #include "wx/object.h"
 #else
     class WXDLLIMPEXP_FWD_BASE wxObject;


@@ -80,7 +79,7 @@ protected:
 };
 
 class WXDLLIMPEXP_BASE wxHashTableBase
 };
 
 class WXDLLIMPEXP_BASE wxHashTableBase

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

     : public wxObject
 #endif
 {
     : public wxObject
 #endif
 {


@@ -150,7 +149,7 @@ protected:
     bool m_deleteContents;
 
 private:
     bool m_deleteContents;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxHashTableBase)
+    wxDECLARE_NO_COPY_CLASS(wxHashTableBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------