Implement delayed destruction for wxPopupTransientWindow.

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 3eb539e9d38b47fbf1955fe08e17008265895cc9..d88d38275b0065b8032c9c21f944dab800723635 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -15,7 +15,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 +80,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 +150,7 @@ protected:
     bool m_deleteContents;
 
 private:
     bool m_deleteContents;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxHashTableBase)
+    wxDECLARE_NO_COPY_CLASS(wxHashTableBase);

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