split wxRegion(wxBitmap) ctor into two ctors with clearer semantics

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 104a7fffb083d74b680c1a40dbb5f722b6dd7d14..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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "timer.h"
 #endif
 
@@ -34,10 +34,10 @@ public:
 protected:
     void Init();
 
-    long m_id;
+    unsigned long m_id;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxTimer)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)
 };
 
 #endif