Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / persist / window.h

diff --git a/include/wx/persist/window.h b/include/wx/persist/window.h
index 84c27ba35c3561bacf367b326b1f3d5e87ac09de..279e11d26de7bea1f0d1f27a56ef65add1baa3df 100644 (file)
--- a/include/wx/persist/window.h
+++ b/include/wx/persist/window.h
@@ -3,7 +3,6 @@
 // Purpose:     wxPersistentWindow declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-01-23
 // Purpose:     wxPersistentWindow declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-01-23

-// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -23,29 +22,15 @@
 
 // type-independent part of wxPersistentWindow
 class wxPersistentWindowBase :
 
 // type-independent part of wxPersistentWindow
 class wxPersistentWindowBase :

-#if wxEVENTS_COMPATIBILITY_2_8
-    // in compatibility mode we need to derive from wxEvtHandler to be able to
-    // handle events
-    public wxEvtHandler ,
-#endif
+    wxBIND_OR_CONNECT_HACK_BASE_CLASS

     public wxPersistentObject
 {
 public:
     wxPersistentWindowBase(wxWindow *win)
         : wxPersistentObject(win)
     {
     public wxPersistentObject
 {
 public:
     wxPersistentWindowBase(wxWindow *win)
         : wxPersistentObject(win)
     {

-#if wxEVENTS_COMPATIBILITY_2_8
-        win->Connect
-             (
-                wxEVT_DESTROY,
-                wxWindowDestroyEventHandler(
-                    wxPersistentWindowBase::HandleDestroy),
-                NULL,
-                this
-             );
-#else // !wxEVENTS_COMPATIBILITY_2_8
-        win->Bind(wxEVT_DESTROY, &wxPersistentWindowBase::HandleDestroy, this);
-#endif // wxEVENTS_COMPATIBILITY_2_8/!wxEVENTS_COMPATIBILITY_2_8
+        wxBIND_OR_CONNECT_HACK(win, wxEVT_DESTROY, wxWindowDestroyEventHandler,
+                               wxPersistentWindowBase::HandleDestroy, this);

     }
 
     virtual wxString GetName() const
     }
 
     virtual wxString GetName() const