[ 1580776 ] wxAnimationCtrl::SetInactiveBitmap

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index fa6f13bbcd46c9ee5c94e4edacad57af34ec68c3..bda45030d2de42535241c6aa91356831fc8c8c4c 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -6,16 +6,12 @@
 // Created:     05.02.2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Karsten Ballüder <ballueder@gmx.net>
 // Created:     05.02.2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Karsten Ballüder <ballueder@gmx.net>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #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


@@ -31,7 +27,7 @@ enum
 {
     // use extended regex syntax
     wxRE_EXTENDED = 0,
 {
     // use extended regex syntax
     wxRE_EXTENDED = 0,

-    
+

     // use advanced RE syntax (built-in regex only)
 #ifdef wxHAS_REGEX_ADVANCED
     wxRE_ADVANCED = 1,
     // use advanced RE syntax (built-in regex only)
 #ifdef wxHAS_REGEX_ADVANCED
     wxRE_ADVANCED = 1,


@@ -87,27 +83,31 @@ 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
     bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT);
 
     // matches the precompiled regular expression against a string, return
     // 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
     //
     // 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()
     bool Matches(const wxChar *text, int flags = 0) const;
     //
     // may only be called after successful call to Compile()
     bool Matches(const wxChar *text, int flags = 0) const;

+    bool Matches(const wxChar *text, int flags, size_t len) const;
+    bool Matches(const wxString& text, int flags = 0) const
+        { return Matches(text.c_str(), flags, text.length()); }

 
     // get the start index and the length of the match of the expression
     // (index 0) or a bracketed subexpression (index != 0)
     //
     // may only be called after successful call to Matches()
     //
 
     // get the start index and the length of the match of the expression
     // (index 0) or a bracketed subexpression (index != 0)
     //
     // 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
     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