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 dc2b749db7b33535e30a848a35cdcbece2c9b726..cf9e490712304466191ff4354beedb1ced7c5310 100644 (file)
--- a/include/wx/palmos/timer.h
+++ b/include/wx/palmos/timer.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.h
+// Name:        wx/palmos/timer.h

 // Purpose:     wxTimer class
 // Purpose:     wxTimer class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,11 +12,7 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "timer.h"
-#endif
-
-class WXDLLEXPORT wxTimer : public wxTimerBase
+class WXDLLIMPEXP_BASE wxTimer : public wxTimerBase

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


@@ -24,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();