attempt to fix timers when creating them with a valid HWND

[wxWidgets.git] / src / common / ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index d42a8ff04aec1a73d99a483de09f5fb2a2cd24af..468a4ac93b81ad81ff902a61fbb2277d15a18315 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "controlbase.h"
     #pragma implementation "statbmpbase.h"
 #endif
@@ -55,7 +55,7 @@ bool wxControlBase::Create(wxWindow *parent,
                            const wxPoint &pos,
                            const wxSize &size,
                            long style,
-                           const wxValidator& validator,
+                           const wxValidator& wxVALIDATOR_PARAM(validator),
                            const wxString &name)
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);