define wxString::iterator::iterator_category correctly if wxUSE_STD_STRING and not...

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 9fc7828003ea4f909e341e2f244fb4c4d4e56f1e..684d6724197f83de0f1a6a1c3224c7497d66723b 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1366,7 +1366,13 @@ public:
     { m_show = event.m_show; }
 
     void SetShow(bool show) { m_show = show; }
-    bool GetShow() const { return m_show; }
+
+    // return true if the window was shown, false if hidden
+    bool IsShown() const { return m_show; }
+
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( bool GetShow() const { return IsShown(); } )
+#endif
 
     virtual wxEvent *Clone() const { return new wxShowEvent(*this); }
 
@@ -1391,8 +1397,11 @@ public:
         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( bool Iconized() const { return IsIconized(); } )
+#endif
     // return true if the frame was iconized, false if restored
-    bool Iconized() const { return m_iconized; }
+    bool IsIconized() const { return m_iconized; }
 
     virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); }
 
@@ -2446,6 +2455,8 @@ protected:
 
     // Is event handler enabled?
     bool                m_enabled;
+    // Avoid adding events from another thread during dtor
+    bool                m_beingDeleted;
 
 
     // The user data: either an object which will be deleted by the container