OSX reshuffling

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

diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h
index a4403b57df591004b1e70122e618661dc7ac6401..2175fb2568e2153613d2e8048857708b28a7ecc8 100644 (file)
--- a/include/wx/dateevt.h
+++ b/include/wx/dateevt.h
@@ -14,6 +14,7 @@
 
 #include "wx/event.h"
 #include "wx/datetime.h"
 
 #include "wx/event.h"
 #include "wx/datetime.h"

+#include "wx/window.h"

 
 // ----------------------------------------------------------------------------
 // wxDateEvent: used by wxCalendarCtrl and wxDatePickerCtrl
 
 // ----------------------------------------------------------------------------
 // wxDateEvent: used by wxCalendarCtrl and wxDatePickerCtrl


@@ -33,29 +34,28 @@ 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&);
 

-#define EVT_DATE_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DATE_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)  wxStaticCastEvent( wxDateEventFunction, & fn ), (wxObject *) NULL),
-
-#ifdef _WX_DEFINE_DATE_EVENTS_
-    DEFINE_EVENT_TYPE(wxEVT_DATE_CHANGED)
+#define wxDateEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDateEventFunction, &func)

 
 

-    IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent)
-#endif
+#define EVT_DATE_CHANGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn))

 
 #endif // _WX_DATEEVT_H_
 
 
 #endif // _WX_DATEEVT_H_