don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/palmos/timer.h b/include/wx/palmos/timer.h
index 9df998f710b05da4bb0d8040a85d6ac53cfd313a..cf9e490712304466191ff4354beedb1ced7c5310 100644 (file)
--- a/include/wx/palmos/timer.h
+++ b/include/wx/palmos/timer.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-class WXDLLEXPORT wxTimer : public wxTimerBase
+class WXDLLIMPEXP_BASE wxTimer : public wxTimerBase

 {
 friend void wxProcessTimer(wxTimer& timer);
 
 {
 friend void wxProcessTimer(wxTimer& timer);
 


@@ -20,7 +20,7 @@ public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }

-    ~wxTimer();
+    virtual ~wxTimer();

 
     virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
     virtual void Stop();
 
     virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
     virtual void Stop();