fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 260313cef64ffbb26530598cd992145292c1d666..f35a07a7f862361443e0d8f2be963a3f11403eb0 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -4,22 +4,17 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "timer.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
-class wxTimer : public wxTimerBase
+class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase
 {
 public:
     wxTimer() { Init(); }