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

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

diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp
index 3b8f7c8ed6fa4309f942fe17b13f2a6e11eccc90..b6cf655b041d4bc20794d9855f2f99ef5adef6d8 100644 (file)
--- a/src/univ/gauge.cpp
+++ b/src/univ/gauge.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "gaugeuniv.h"
 #endif
 
@@ -65,12 +65,12 @@ bool wxGauge::Create(wxWindow *parent,
     if ( !wxGaugeBase::Create(parent, id, range, pos, size, style,
                               validator, name) )
     {
-        return FALSE;
+        return false;
     }
 
     SetBestSize(size);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -104,12 +104,12 @@ wxSize wxGauge::DoGetBestClientSize() const
     if ( IsVertical() )
     {
         size.x = (3*size.y) / 2 + 2;
-        size.y = -1;
+        size.y = wxDefaultCoord;
     }
     else
     {
         size.y = (3*size.x) / 2 + 2;
-        size.x = -1;
+        size.x = wxDefaultCoord;
     }
 
     return size;