Applied Patch #1502801: Missing Clone() functions from some events

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

diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index 1742257d00ed1388ae1f774914f1597575c486c7..d3a2b509d3dc25b48a9a2f19f82ec5f2f73cfd35 100644 (file)
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -170,10 +170,14 @@ public:
     wxColour GetColour() const { return m_colour; }
     void SetColour(const wxColour &c) { m_colour = c; }
 
     wxColour GetColour() const { return m_colour; }
     void SetColour(const wxColour &c) { m_colour = c; }
 

+
+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxColourPickerEvent(*this); }
+

 private:
     wxColour m_colour;
 
 private:
     wxColour m_colour;
 

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourPickerEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent)

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

diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h
index b37340c5cd6ce0b07edd367d4782c474cd6e8c70..f1f4f60d67b8a9b1d7492e2d87b8ba737fc52792 100644 (file)
--- a/include/wx/dateevt.h
+++ b/include/wx/dateevt.h
@@ -34,10 +34,13 @@ public:
     const wxDateTime& GetDate() const { return m_date; }
     void SetDate(const wxDateTime &date) { m_date = date; }
 
     const wxDateTime& GetDate() const { return m_date; }
     void SetDate(const wxDateTime &date) { m_date = date; }
 

+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxDateEvent(*this); }
+

 private:
     wxDateTime m_date;
 
 private:
     wxDateTime m_date;
 

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDateEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent)

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

diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index d82fecb82a941e836ea467354ed72c518fa9e8b2..e94746736b7b0ff7921f3458aa043b534d30f0c9 100644 (file)
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -343,10 +343,13 @@ public:
     wxString GetPath() const { return m_path; }
     void SetPath(const wxString &p) { m_path = p; }
 
     wxString GetPath() const { return m_path; }
     void SetPath(const wxString &p) { m_path = p; }
 

+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxFileDirPickerEvent(*this); }
+

 private:
     wxString m_path;
 
 private:
     wxString m_path;
 

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileDirPickerEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent)

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

diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index 4175ba3f05ac35549d1d2a5c2f7842d5683681ab..1137228e00ed86a061701a64eac23aac71c58d05 100644 (file)
--- a/include/wx/fontpicker.h
+++ b/include/wx/fontpicker.h
@@ -194,10 +194,13 @@ public:
     wxFont GetFont() const { return m_font; }
     void SetFont(const wxFont &c) { m_font = c; }
 
     wxFont GetFont() const { return m_font; }
     void SetFont(const wxFont &c) { m_font = c; }
 

+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxFontPickerEvent(*this); }
+

 private:
     wxFont m_font;
 
 private:
     wxFont m_font;
 

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontPickerEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFontPickerEvent)

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

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 442c22a01b3edc7b2652fb394589defd90c1127a..cfbed46e96e5842fd5db98e6c5b16bb14bee4c72 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -171,35 +171,50 @@ END_DECLARE_EVENT_TYPES()
 class WXDLLIMPEXP_ADV wxHyperlinkEvent : public wxCommandEvent
 {
 public:
 class WXDLLIMPEXP_ADV wxHyperlinkEvent : public wxCommandEvent
 {
 public:

-

     wxHyperlinkEvent() {}
     wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url)
     wxHyperlinkEvent() {}
     wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url)

-     : wxCommandEvent(wxEVT_COMMAND_HYPERLINK, id), m_url(url)
-        { SetEventObject(generator); }
+        : wxCommandEvent(wxEVT_COMMAND_HYPERLINK, id),
+          m_url(url)
+    {
+        SetEventObject(generator);
+    }

 
     // Returns the URL associated with the hyperlink control
     // that the user clicked on.
     wxString GetURL() const { return m_url; }
     void SetURL(const wxString &url) { m_url=url; }
 
 
     // Returns the URL associated with the hyperlink control
     // that the user clicked on.
     wxString GetURL() const { return m_url; }
     void SetURL(const wxString &url) { m_url=url; }
 

+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxHyperlinkEvent(*this); }
+

 private:
 
     // URL associated with the hyperlink control that the used clicked on.
     wxString m_url;
 private:
 
     // URL associated with the hyperlink control that the used clicked on.
     wxString m_url;

+
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHyperlinkEvent)

 };
 
 };
 

-// Define a typedef for event handler functions.
-typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);

 
 

-// Define an event table macro.
-#define EVT_HYPERLINK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_HYPERLINK, \
-    id, id, (wxObjectEventFunction) (wxEventFunction) \
-    wxStaticCastEvent(wxHyperlinkEventFunction, &fn), (wxObject *) NULL),
+// ----------------------------------------------------------------------------
+// event types and macros
+// ----------------------------------------------------------------------------
+
+typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);

 
 

-// Newer event macro

 #define wxHyperlinkEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxHyperlinkEventFunction, &func)
 
 #define wxHyperlinkEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxHyperlinkEventFunction, &func)
 

+#define EVT_HYPERLINK(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_HYPERLINK, id, wxHyperlinkEventHandler(fn))
+
+#ifdef _WX_DEFINE_DATE_EVENTS_
+    DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
+
+    IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
+#endif
+
+

 #endif // wxUSE_HYPERLINKCTRL
 
 #endif // _WX_HYPERLINK_H__
 #endif // wxUSE_HYPERLINKCTRL
 
 #endif // _WX_HYPERLINK_H__

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index 50693dd9d047561cf6fdbb72f94dbf02c10125f5..4288e4c3037b6c686fd06d46b1b9be55946eeefe 100644 (file)
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -47,6 +47,7 @@
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxControl)
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 
 // reserved for internal use only
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 
 // reserved for internal use only