Added implementation of MDI using top level windows

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

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

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

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


@@ -34,7 +34,7 @@ public:
 protected:
     void Init();
 
 protected:
     void Init();
 

-    long m_id;
+    unsigned long m_id;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)