support retina display

[wxWidgets.git] / include / wx / regex.h

diff --git a/include/wx/regex.h b/include/wx/regex.h
index a7287a534283e30d48a792351dd18bfdb6640b58..77ed092997277fb793df6661c58e4186d4a852bf 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -1,26 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/regex.h
 // Purpose:     regular expression matching
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/regex.h
 // Purpose:     regular expression matching

-// Author:      Karsten Ballüder
+// Author:      Karsten Ballueder

 // 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 Ballueder <ballueder@gmx.net>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "regex.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_REGEX
 
 #include "wx/defs.h"
 
 #if wxUSE_REGEX
 

-class WXDLLIMPEXP_BASE wxString;
+#include "wx/string.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -72,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
 {


@@ -98,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)


@@ -131,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 occurrence (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 occurrence

     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 occurrences: 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); }