Applied patch [ 1204548 ] Add Get and SetVolume to wxMediaCtrl and fix bug 1200182

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

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 5c131f1cba03d965cdf004bb9b21c26736e704ae..43641b726eec146a4b0965cb29f90c2d1a00cd73 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -6,7 +6,7 @@
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -102,11 +102,11 @@ void wxStringTokenizer::Reinit(const wxString& str)
 // do we have more of them?
 bool wxStringTokenizer::HasMoreTokens() const
 {
-    wxCHECK_MSG( IsOk(), FALSE, _T("you should call SetString() first") );
+    wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") );
 
     if ( m_string.find_first_not_of(m_delims) == wxString::npos )
     {
-        // no non empty tokens left, but in 2 cases we still may return TRUE if
+        // no non empty tokens left, but in 2 cases we still may return true if
         // GetNextToken() wasn't called yet for this empty token:
         //
         //   a) in wxTOKEN_RET_EMPTY_ALL mode we always do it
@@ -115,13 +115,13 @@ bool wxStringTokenizer::HasMoreTokens() const
         //      token just before it
         return (m_mode == wxTOKEN_RET_EMPTY_ALL) ||
                (m_mode == wxTOKEN_RET_EMPTY && m_pos == 0)
-                    ? m_hasMore : FALSE;
+                    ? m_hasMore : false;
     }
     else
     {
         // there are non delimiter characters left, hence we do have more
         // tokens
-        return TRUE;
+        return true;
     }
 }
 
@@ -181,7 +181,7 @@ wxString wxStringTokenizer::GetNextToken()
 
             // no more tokens in this string, even in wxTOKEN_RET_EMPTY_ALL
             // mode (we will return the trailing one right now in this case)
-            m_hasMore = FALSE;
+            m_hasMore = false;
         }
         else
         {