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
This commit is contained in:
Włodzimierz Skiba
2004-09-21 18:15:59 +00:00
parent 62b3a2467f
commit 701a0b4766
6 changed files with 35 additions and 35 deletions

View File

@@ -52,10 +52,10 @@ public:
{ {
SetSelection(sel); SetSelection(sel);
return TRUE; return true;
} }
return FALSE; return false;
} }
// string access // string access
@@ -76,8 +76,8 @@ public:
virtual void SetString(int n, const wxString& label) = 0; virtual void SetString(int n, const wxString& label) = 0;
// change the individual radio button state // change the individual radio button state
virtual void Enable(int n, bool enable = TRUE) = 0; virtual void Enable(int n, bool enable = true) = 0;
virtual void Show(int n, bool show = TRUE) = 0; virtual void Show(int n, bool show = true) = 0;
// layout parameters // layout parameters
virtual int GetColumnCount() const = 0; virtual int GetColumnCount() const = 0;

View File

@@ -29,7 +29,7 @@ class WXDLLIMPEXP_BASE wxRecursionGuard
public: public:
wxRecursionGuard(wxRecursionGuardFlag& flag) wxRecursionGuard(wxRecursionGuardFlag& flag)
: m_flag(flag) : m_flag(flag)
{ {
m_isInside = flag++ != 0; m_isInside = flag++ != 0;
} }

View File

@@ -31,7 +31,7 @@ enum
{ {
// use extended regex syntax // use extended regex syntax
wxRE_EXTENDED = 0, wxRE_EXTENDED = 0,
// use advanced RE syntax (built-in regex only) // use advanced RE syntax (built-in regex only)
#ifdef wxHAS_REGEX_ADVANCED #ifdef wxHAS_REGEX_ADVANCED
wxRE_ADVANCED = 1, wxRE_ADVANCED = 1,
@@ -87,15 +87,15 @@ public:
(void)Compile(expr, flags); (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; } 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 // if string has a syntax error
bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT); bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT);
// matches the precompiled regular expression against a string, return // 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 // flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL
// //
@@ -107,7 +107,7 @@ public:
// //
// may only be called after successful call to Matches() // 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; 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 // return the part of string corresponding to the match, empty string is

View File

@@ -98,7 +98,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
default: default:
wxFAIL_MSG( _T("unexpected wxDirection value") ); wxFAIL_MSG( _T("unexpected wxDirection value") );
return -1; return wxNOT_FOUND;
} }
// ensure that the item is in range [0..count) // ensure that the item is in range [0..count)

View File

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

View File

@@ -101,7 +101,7 @@ static bool DoRegionUnion(wxRegion& region,
return true; return true;
} }
bool wxRegion::Union(const wxBitmap& bmp) bool wxRegion::Union(const wxBitmap& bmp)
{ {