Source cleaning: whitespaces, tabs, -1/wxNOT_FOUND, TRUE/true, FALSE/false.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index fc2b142832bb970a771a6147a98755865ea37670..1fea3e7526caa291eb4bf333ebb2c07afbfbcb5e 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -52,10 +52,10 @@ public:
         {
             SetSelection(sel);
 
-            return TRUE;
+            return true;
         }
 
-        return FALSE;
+        return false;
     }
 
     // string access
@@ -76,8 +76,8 @@ public:
     virtual void SetString(int n, const wxString& label) = 0;
 
     // change the individual radio button state
-    virtual void Enable(int n, bool enable = TRUE) = 0;
-    virtual void Show(int n, bool show = TRUE) = 0;
+    virtual void Enable(int n, bool enable = true) = 0;
+    virtual void Show(int n, bool show = true) = 0;
 
     // layout parameters
     virtual int GetColumnCount() const = 0;

diff --git a/include/wx/recguard.h b/include/wx/recguard.h
index 520cc1f050624932c20448ea44db4fb31041c964..010637efdb6b9d848d08bb9b9eee97a5c4942f3f 100644 (file)
--- a/include/wx/recguard.h
+++ b/include/wx/recguard.h
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_BASE wxRecursionGuard
 public:
     wxRecursionGuard(wxRecursionGuardFlag& flag)
         : m_flag(flag)
-    { 
+    {
         m_isInside = flag++ != 0;
     }
 

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 851ab153b250e62bc6bce8a4a8c0f8e209c3f037..a7287a534283e30d48a792351dd18bfdb6640b58 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -31,7 +31,7 @@ enum
 {
     // use extended regex syntax
     wxRE_EXTENDED = 0,
-    
+
     // use advanced RE syntax (built-in regex only)
 #ifdef wxHAS_REGEX_ADVANCED
     wxRE_ADVANCED = 1,
@@ -87,15 +87,15 @@ public:
         (void)Compile(expr, flags);
     }
 
-    // return TRUE if this is a valid compiled regular expression
+    // return true if this is a valid compiled regular expression
     bool IsValid() const { return m_impl != NULL; }
 
-    // compile the string into regular expression, return TRUE if ok or FALSE
+    // compile the string into regular expression, return true if ok or false
     // if string has a syntax error
     bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT);
 
     // matches the precompiled regular expression against a string, return
-    // TRUE if matches and FALSE otherwise
+    // true if matches and false otherwise
     //
     // flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL
     //
@@ -107,7 +107,7 @@ public:
     //
     // may only be called after successful call to Matches()
     //
-    // return FALSE if no match or on error
+    // return false if no match or on error
     bool GetMatch(size_t *start, size_t *len, size_t index = 0) const;
 
     // return the part of string corresponding to the match, empty string is

diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index c732658d751922db3879e930c7b048b2da9b2f47..66254736c6b246ab766cc5a81b19b13a9c9faf65 100644 (file)
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -98,7 +98,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
 
         default:
             wxFAIL_MSG( _T("unexpected wxDirection value") );
-            return -1;
+            return wxNOT_FOUND;
     }
 
     // ensure that the item is in range [0..count)

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 1837bfff302598e40fc69984b7a1e10657d94e43..8ae727359c27b2ba20682a2e0ba284cf2b693247 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -61,7 +61,7 @@ public:
     wxRegExImpl();
     ~wxRegExImpl();
 
-    // return TRUE if Compile() had been called successfully
+    // return true if Compile() had been called successfully
     bool IsValid() const { return m_isCompiled; }
 
     // RE operations
@@ -79,7 +79,7 @@ private:
     // init the members
     void Init()
     {
-        m_isCompiled = FALSE;
+        m_isCompiled = false;
         m_Matches = NULL;
         m_nMatches = 0;
     }
@@ -110,7 +110,7 @@ private:
     regmatch_t *m_Matches;
     size_t      m_nMatches;
 
-    // TRUE if m_RegEx is valid
+    // true if m_RegEx is valid
     bool        m_isCompiled;
 };
 
@@ -210,7 +210,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
         wxLogError(_("Invalid regular expression '%s': %s"),
                    expr.c_str(), GetErrorMsg(errorcode, !conv).c_str());
 
-        m_isCompiled = FALSE;
+        m_isCompiled = false;
     }
     else // ok
     {
@@ -253,7 +253,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
             }
         }
 
-        m_isCompiled = TRUE;
+        m_isCompiled = true;
     }
 
     return IsValid();
@@ -261,7 +261,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
 
 bool wxRegExImpl::Matches(const wxChar *str, int flags) const
 {
-    wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") );
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
 
     // translate our flags to regexec() ones
     wxASSERT_MSG( !(flags & ~(wxRE_NOTBOL | wxRE_NOTEOL)),
@@ -293,7 +293,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     {
         case 0:
             // matched successfully
-            return TRUE;
+            return true;
 
         default:
             // an error occured
@@ -303,16 +303,16 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
 
         case REG_NOMATCH:
             // no match
-            return FALSE;
+            return false;
     }
 }
 
 bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
 {
-    wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") );
-    wxCHECK_MSG( m_nMatches, FALSE, _T("can't use with wxRE_NOSUB") );
-    wxCHECK_MSG( m_Matches, FALSE, _T("must call Matches() first") );
-    wxCHECK_MSG( index < m_nMatches, FALSE, _T("invalid match index") );
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
+    wxCHECK_MSG( m_nMatches, false, _T("can't use with wxRE_NOSUB") );
+    wxCHECK_MSG( m_Matches, false, _T("must call Matches() first") );
+    wxCHECK_MSG( index < m_nMatches, false, _T("invalid match index") );
 
     const regmatch_t& match = m_Matches[index];
 
@@ -321,7 +321,7 @@ bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
     if ( len )
         *len = match.rm_eo - match.rm_so;
 
-    return TRUE;
+    return true;
 }
 
 size_t wxRegExImpl::GetMatchCount() const
@@ -336,8 +336,8 @@ int wxRegExImpl::Replace(wxString *text,
                          const wxString& replacement,
                          size_t maxMatches) const
 {
-    wxCHECK_MSG( text, -1, _T("NULL text in wxRegEx::Replace") );
-    wxCHECK_MSG( IsValid(), -1, _T("must successfully Compile() first") );
+    wxCHECK_MSG( text, wxNOT_FOUND, _T("NULL text in wxRegEx::Replace") );
+    wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
 
     // the replacement text
     wxString textNew;
@@ -372,7 +372,7 @@ int wxRegExImpl::Replace(wxString *text,
         // the replacement text anew after each match
         if ( mayHaveBackrefs )
         {
-            mayHaveBackrefs = FALSE;
+            mayHaveBackrefs = false;
             textNew.clear();
             textNew.reserve(replacement.length());
 
@@ -413,7 +413,7 @@ int wxRegExImpl::Replace(wxString *text,
                         textNew += wxString(text->c_str() + matchStart + start,
                                             len);
 
-                        mayHaveBackrefs = TRUE;
+                        mayHaveBackrefs = true;
                     }
                 }
                 else // ordinary character
@@ -429,7 +429,7 @@ int wxRegExImpl::Replace(wxString *text,
             // we did have match as Matches() returned true above!
             wxFAIL_MSG( _T("internal logic error in wxRegEx::Replace") );
 
-            return -1;
+            return wxNOT_FOUND;
         }
 
         matchStart += start;
@@ -471,22 +471,22 @@ bool wxRegEx::Compile(const wxString& expr, int flags)
         delete m_impl;
         m_impl = NULL;
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxRegEx::Matches(const wxChar *str, int flags) const
 {
-    wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") );
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
 
     return m_impl->Matches(str, flags);
 }
 
 bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const
 {
-    wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") );
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
 
     return m_impl->GetMatch(start, len, index);
 }
@@ -511,7 +511,7 @@ int wxRegEx::Replace(wxString *pattern,
                      const wxString& replacement,
                      size_t maxMatches) const
 {
-    wxCHECK_MSG( IsValid(), -1, _T("must successfully Compile() first") );
+    wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
 
     return m_impl->Replace(pattern, replacement, maxMatches);
 }

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 2b1b5b6600a5b234021b58cc2d7e1043524c1ae7..2368fbc13376581da968c9e7a21156a6a19abe34 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -101,7 +101,7 @@ static bool DoRegionUnion(wxRegion& region,
 
     return true;
 }
- 
+
 
 bool wxRegion::Union(const wxBitmap& bmp)
 {