projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied rowspan patch #15276 (dghart)
[wxWidgets.git]
/
include
/
wx
/
regex.h
diff --git
a/include/wx/regex.h
b/include/wx/regex.h
index c30f0bf140058169a9d0e710e566372b06a8fae8..77ed092997277fb793df6661c58e4186d4a852bf 100644
(file)
--- a/
include/wx/regex.h
+++ b/
include/wx/regex.h
@@
-1,11
+1,11
@@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/regex.h
// Purpose: regular expression matching
///////////////////////////////////////////////////////////////////////////////
// Name: wx/regex.h
// Purpose: regular expression matching
-// Author: Karsten Ball
ü
der
+// Author: Karsten Ball
ue
der
// Modified by: VZ at 13.07.01 (integrated to wxWin)
// Created: 05.02.2000
// RCS-ID: $Id$
// Modified by: VZ at 13.07.01 (integrated to wxWin)
// Created: 05.02.2000
// RCS-ID: $Id$
-// Copyright: (c) 2000 Karsten Ball
ü
der <ballueder@gmx.net>
+// Copyright: (c) 2000 Karsten Ball
ue
der <ballueder@gmx.net>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-16,7
+16,7
@@
#if wxUSE_REGEX
#if wxUSE_REGEX
-class WXDLLIMPEXP_BASE wxString;
+#include "wx/string.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-68,7
+68,7
@@
enum
// wxRegEx: a regular expression
// ----------------------------------------------------------------------------
// wxRegEx: a regular expression
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_BASE wxRegExImpl;
+class WXDLLIMPEXP_
FWD_
BASE wxRegExImpl;
class WXDLLIMPEXP_BASE wxRegEx
{
class WXDLLIMPEXP_BASE wxRegEx
{
@@
-94,9
+94,12
@@
public:
// true if matches and false otherwise
//
// flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL
// true if matches and false otherwise
//
// flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL
+ // len may be the length of text (ignored by most system regex libs)
//
// may only be called after successful call to Compile()
//
// may only be called after successful call to Compile()
- bool Matches(const wxChar *text, int flags = 0) const;
+ bool Matches(const wxString& text, int flags = 0) const;
+ bool Matches(const wxChar *text, int flags, size_t len) const
+ { return Matches(wxString(text, len), flags); }
// get the start index and the length of the match of the expression
// (index 0) or a bracketed subexpression (index != 0)
// get the start index and the length of the match of the expression
// (index 0) or a bracketed subexpression (index != 0)
@@
-127,16
+130,16
@@
public:
// pattern match
//
// maxMatches may be used to limit the number of replacements made, setting
// pattern match
//
// maxMatches may be used to limit the number of replacements made, setting
- // it to 1, for example, will only replace first occurence (if any) of the
+ // it to 1, for example, will only replace first occur
r
ence (if any) of the
// pattern in the text while default value of 0 means replace all
int Replace(wxString *text, const wxString& replacement,
size_t maxMatches = 0) const;
// pattern in the text while default value of 0 means replace all
int Replace(wxString *text, const wxString& replacement,
size_t maxMatches = 0) const;
- // replace the first occurence
+ // replace the first occur
r
ence
int ReplaceFirst(wxString *text, const wxString& replacement) const
{ return Replace(text, replacement, 1); }
int ReplaceFirst(wxString *text, const wxString& replacement) const
{ return Replace(text, replacement, 1); }
- // replace all occurences: this is actually a synonym for Replace()
+ // replace all occur
r
ences: this is actually a synonym for Replace()
int ReplaceAll(wxString *text, const wxString& replacement) const
{ return Replace(text, replacement, 0); }
int ReplaceAll(wxString *text, const wxString& replacement) const
{ return Replace(text, replacement, 0); }