[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / univ / control.cpp

diff --git a/src/univ/control.cpp b/src/univ/control.cpp
index 89d9065e015db3b444f6d03fa7c19253d63164d4..2b31850db1a7dc1ccf25198839337b4e54a869ec 100644 (file)
--- a/src/univ/control.cpp
+++ b/src/univ/control.cpp
@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "control.h"
 #endif
 
@@ -70,18 +70,13 @@ bool wxControl::Create(wxWindow *parent,
                        const wxValidator& validator,
                        const wxString& name)
 {
-    // Ee use wxNO_FULL_REPAINT_ON_RESIZE by default as it results in much
-    // less flicker and none of the standard controls needs to be entirely
-    // repainted after resize anyhow.
-    if ( !wxControlBase::Create(parent, id, pos, size,
-                                style | wxNO_FULL_REPAINT_ON_RESIZE ,
-                                validator, name) )
+    if ( !wxControlBase::Create(parent, id, pos, size, style, validator, name) )
     {
         // underlying window creation failed?
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------