Added CanApplyParentThemeBackground and use it in wxMSW's

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

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index efe303411c815bca8406fb0c31643e8f79eac437..83a6e5c2e2f3e1ccc411440ca6b0f92fe55a139f 100644 (file)
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -11,7 +11,7 @@
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "timer.h"
 #endif
 
     #pragma interface "timer.h"
 #endif
 


@@ -25,7 +25,7 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
 {
 public:
     wxTimer() { Init(); }
 {
 public:
     wxTimer() { Init(); }

-    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+    wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)

         { Init(); }
     ~wxTimer();
 
         { Init(); }
     ~wxTimer();