porting reordering of controls back from 2.8

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

diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h
index b37340c5cd6ce0b07edd367d4782c474cd6e8c70..18db28eb603e58fed2a4b3823836b9da0b0508a1 100644 (file)
--- a/include/wx/dateevt.h
+++ b/include/wx/dateevt.h
@@ -34,19 +34,20 @@ 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)

 };
 
 // ----------------------------------------------------------------------------
 // event types and macros for handling them
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // event types and macros for handling them
 // ----------------------------------------------------------------------------
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, 1101)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_DATE_CHANGED;

 
 typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&);
 
 
 typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&);
 


@@ -57,7 +58,7 @@ typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&);
     wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn))
 
 #ifdef _WX_DEFINE_DATE_EVENTS_
     wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn))
 
 #ifdef _WX_DEFINE_DATE_EVENTS_

-    DEFINE_EVENT_TYPE(wxEVT_DATE_CHANGED)
+    const wxEventType wxEVT_DATE_CHANGED = wxNewEventType();

 
     IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent)
 #endif
 
     IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent)
 #endif