fixed MSVC6 warning

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

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index a8adee15fd460537c3d6e691c597fd796aac67e0..a4be5ca35c5e938255881f8a10ac513b06c8d027 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "choicebase.h"
 #endif
 
     #pragma implementation "choicebase.h"
 #endif
 


@@ -50,12 +50,12 @@ wxChoiceBase::~wxChoiceBase()
 bool wxChoiceBase::SetStringSelection(const wxString& s)
 {
     int sel = FindString(s);
 bool wxChoiceBase::SetStringSelection(const wxString& s)
 {
     int sel = FindString(s);

-    wxCHECK_MSG( sel != -1, FALSE,
+    wxCHECK_MSG( sel != -1, false,

                  wxT("invalid string in wxChoice::SetStringSelection") );
 
     Select(sel);
 
                  wxT("invalid string in wxChoice::SetStringSelection") );
 
     Select(sel);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------