X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..52069700e7f9c4cc1fc4379306e9f763c5b83073:/src/common/tokenzr.cpp

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 32c220a69a..43641b726e 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "tokenzr.h"
 #endif
 
@@ -29,6 +29,7 @@
 #endif
 
 #include "wx/tokenzr.h"
+#include "wx/arrstr.h"
 
 // Required for wxIs... functions
 #include <ctype.h>
@@ -101,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
@@ -114,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;
     }
 }
 
@@ -180,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
         {