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

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

diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp
index 8d510384311734610801d1d2e81dbd43d8d9e985..f305d9ff2d646dbd78221c88b70341aa15f74ad0 100644 (file)
--- a/src/univ/statbmp.cpp
+++ b/src/univ/statbmp.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univstatbmp.h"
 #endif
 
@@ -58,7 +58,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
                             const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
     // set bitmap first
     SetBitmap(label);
@@ -66,7 +66,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // and adjust our size to fit it after this
     SetBestSize(size);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------