X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3f9e20cb15c62bd347a8e52d2d36529adbdb3d6..7b504551c292ecb4296693983161ac5ad03745f6:/include/wx/regex.h

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 1656008c5a..c30f0bf140 100644
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -12,10 +12,6 @@
 #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
@@ -31,7 +27,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 +83,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 +103,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
@@ -116,6 +112,12 @@ public:
     // may only be called after successful call to Matches()
     wxString GetMatch(const wxString& text, size_t index = 0) const;
 
+    // return the size of the array of matches, i.e. the number of bracketed
+    // subexpressions plus one for the expression itself, or 0 on error.
+    //
+    // may only be called after successful call to Compile()
+    size_t GetMatchCount() const;
+
     // replaces the current regular expression in the string pointed to by
     // pattern, with the text in replacement and return number of matches
     // replaced (maybe 0 if none found) or -1 on error