fix wxTimerEvent and wxTreeCtrl to use IMPLEMENT_DYNAMIC_CLASS macro

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 4e36b6d35f174fc2ea4ddac948d86a19b87a08a7..a8501510db992643928e1b16c23c0eaf1b7caaa5 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -152,25 +152,27 @@ private:
 class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
 {
 public:
+    wxTimerEvent()
+        : wxEvent(wxID_ANY, wxEVT_TIMER) { m_timer=NULL; }
+
     wxTimerEvent(wxTimer& timer)
         : wxEvent(timer.GetId(), wxEVT_TIMER),
-          m_timer(timer)
+          m_timer(&timer)
     {
         SetEventObject(timer.GetOwner());
     }
 
     // accessors
-    int GetInterval() const { return m_timer.GetInterval(); }
-    wxTimer& GetTimer() const { return m_timer; }
+    int GetInterval() const { return m_timer->GetInterval(); }
+    wxTimer& GetTimer() const { return *m_timer; }
 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
 
 private:
-    wxTimer& m_timer;
+    wxTimer* m_timer;
 
-    DECLARE_ABSTRACT_CLASS(wxTimerEvent)
-    DECLARE_NO_ASSIGN_CLASS(wxTimerEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
 };
 
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index a3a75922a5976613a0eac5c6918cd6a09cd35d68..d66739600e8a495b210d9908fd27ae59c5868bea 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -278,10 +278,10 @@ class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase;
 class WXDLLIMPEXP_CORE wxTreeEvent : public wxNotifyEvent
 {
 public:
+    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     wxTreeEvent(wxEventType commandType,
                 wxTreeCtrlBase *tree,
                 const wxTreeItemId &item = wxTreeItemId());
-    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     wxTreeEvent(const wxTreeEvent& event);
 
     virtual wxEvent *Clone() const { return new wxTreeEvent(*this); }

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 8cfe29d11362d339c03c6e49e19d22fdc1cc4448..bb89232709506e28b4e75acc6412270b1cc6d308 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -39,7 +39,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimerEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
 
 // ============================================================================
 // wxTimerBase implementation

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 7a1a2d8fcf594f8eb9df053e1136a1c2b43612d1..bea5d72e35195daa1931ece3953ae9df07b3efa7 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -59,8 +59,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MENU)
 // Tree event
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTreeEvent, wxNotifyEvent)
-
+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
 
 wxTreeEvent::wxTreeEvent(wxEventType commandType,
                          wxTreeCtrlBase *tree,