fix wxPowerEvent, wxRichTextEvent and wxWizardEvent so that they pass the runtime...

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

diff --git a/include/wx/power.h b/include/wx/power.h
index f1a23b9fe27cae0e1b9e887411a6207a325e5056..ccd04343ac7cc65cc3e27b4bdb8d477e9d28f8d9 100644 (file)
--- a/include/wx/power.h
+++ b/include/wx/power.h
@@ -49,6 +49,9 @@ enum wxBatteryState
 class WXDLLIMPEXP_BASE wxPowerEvent : public wxEvent
 {
 public:
+    wxPowerEvent()            // just for use by wxRTTI
+        : m_veto(false) { }
+
     wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType)
     {
         m_veto = false;
@@ -67,7 +70,7 @@ public:
 private:
     bool m_veto;
 
-    DECLARE_ABSTRACT_CLASS(wxPowerEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPowerEvent)
 };
 
 extern WXDLLIMPEXP_BASE const wxEventType wxEVT_POWER_SUSPENDING;

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index ea570b31bc2215860d81665cba27766d702f58af..1368e5e785fe67bb96774c9b49862ad41a187152 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -272,12 +272,13 @@ public:
 
     wxWizardPage*   GetPage() const { return m_page; }
 
+    virtual wxEvent *Clone() const { return new wxWizardEvent(*this); }
+
 private:
     bool m_direction;
     wxWizardPage*    m_page;
 
-    DECLARE_DYNAMIC_CLASS(wxWizardEvent)
-    DECLARE_NO_COPY_CLASS(wxWizardEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWizardEvent)
 };
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/powercmn.cpp b/src/common/powercmn.cpp
index fa7eb03b206a1dcc85aaf00e0272fb3262a2f2d9..578dbb23096af365eade50585ee2d7061e97379d 100644 (file)
--- a/src/common/powercmn.cpp
+++ b/src/common/powercmn.cpp
@@ -39,7 +39,7 @@
     DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPEND_CANCEL)
     DEFINE_EVENT_TYPE(wxEVT_POWER_RESUME)
 
-    IMPLEMENT_ABSTRACT_CLASS(wxPowerEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxPowerEvent, wxEvent)
 #endif
 
 // provide stubs for the systems not implementing these functions

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 199d8067dbae229de21b85e7a6de54742f708bf6..d9cc7959576023a2973a5d715962e8b1dd5bac53 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -120,9 +120,9 @@ private:
 };
 #endif
 
-IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
+IMPLEMENT_DYNAMIC_CLASS( wxRichTextCtrl, wxControl )
 
-IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent )
 
 BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
     EVT_PAINT(wxRichTextCtrl::OnPaint)