git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57588
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
{
public:
class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
{
public:
+ wxTimerEvent()
+ : wxEvent(wxID_ANY, wxEVT_TIMER) { m_timer=NULL; }
+
wxTimerEvent(wxTimer& timer)
: wxEvent(timer.GetId(), wxEVT_TIMER),
wxTimerEvent(wxTimer& timer)
: wxEvent(timer.GetId(), wxEVT_TIMER),
{
SetEventObject(timer.GetOwner());
}
// accessors
{
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:
// implement the base class pure virtual
virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
private:
- DECLARE_ABSTRACT_CLASS(wxTimerEvent)
- DECLARE_NO_ASSIGN_CLASS(wxTimerEvent)
+ DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
};
typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
};
typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
class WXDLLIMPEXP_CORE wxTreeEvent : public wxNotifyEvent
{
public:
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,
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); }
wxTreeEvent(const wxTreeEvent& event);
virtual wxEvent *Clone() const { return new wxTreeEvent(*this); }
// wxWin macros
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTimerEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
// ============================================================================
// wxTimerBase implementation
// ============================================================================
// wxTimerBase implementation
// Tree event
// ----------------------------------------------------------------------------
// Tree event
// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTreeEvent, wxNotifyEvent)
-
+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
wxTreeEvent::wxTreeEvent(wxEventType commandType,
wxTreeCtrlBase *tree,
wxTreeEvent::wxTreeEvent(wxEventType commandType,
wxTreeCtrlBase *tree,