Remove wxRTTI macro for wxComboBox from Motif port.

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 87ac6b9e065f7615861e3332e7a048ba562e2493..0b9a63b0825b9a0596a065d76ef059bea93af8af 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_BASE wxTimerImpl;
 class WXDLLIMPEXP_FWD_BASE wxTimerEvent;
 
 // timer event type
 class WXDLLIMPEXP_FWD_BASE wxTimerEvent;
 
 // timer event type

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_TIMER, wxTimerEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_TIMER, wxTimerEvent);

 
 // the interface of wxTimer class
 class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler
 
 // the interface of wxTimer class
 class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler


@@ -113,7 +113,7 @@ protected:
 
     wxTimerImpl *m_impl;
 
 
     wxTimerImpl *m_impl;
 

-    DECLARE_NO_COPY_CLASS(wxTimer)
+    wxDECLARE_NO_COPY_CLASS(wxTimer);

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


@@ -146,7 +146,7 @@ public:
 private:
     wxTimer& m_timer;
 
 private:
     wxTimer& m_timer;
 

-    DECLARE_NO_COPY_CLASS(wxTimerRunner)
+    wxDECLARE_NO_COPY_CLASS(wxTimerRunner);

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


@@ -172,6 +172,7 @@ public:
 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }

+    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_TIMER; }

 
 private:
     wxTimer* m_timer;
 
 private:
     wxTimer* m_timer;