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

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

diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp
index f20dbf3eb42db1ba8c641469c1d53da2152a1ee8..ba0749f97dcfb618c541750593bdb7459d41ce67 100644 (file)
--- a/src/univ/theme.cpp
+++ b/src/univ/theme.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "theme.h"
 #endif
 
     #pragma implementation "theme.h"
 #endif
 


@@ -86,7 +86,7 @@ wxThemeInfo::wxThemeInfo(Constructor c,
     if ( ms_theme )
     {
         // we already have a theme
     if ( ms_theme )
     {
         // we already have a theme

-        return TRUE;
+        return true;

     }
 
     wxString nameDefTheme;
     }
 
     wxString nameDefTheme;


@@ -121,13 +121,13 @@ wxThemeInfo::wxThemeInfo(Constructor c,
     {
         wxLogError(_("Failed to initialize GUI: no built-in themes found."));
 
     {
         wxLogError(_("Failed to initialize GUI: no built-in themes found."));
 

-        return FALSE;
+        return false;

     }
 
     // Set the theme as current.
     wxTheme::Set(theme);
 
     }
 
     // Set the theme as current.
     wxTheme::Set(theme);
 

-    return TRUE;
+    return true;

 }
 
 /* static */ wxTheme *wxTheme::Set(wxTheme *theme)
 }
 
 /* static */ wxTheme *wxTheme::Set(wxTheme *theme)