Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / tokenzr.h

diff --git a/interface/wx/tokenzr.h b/interface/wx/tokenzr.h
index 15c17edf22cb25b3f0d3e536896ba5e626ebcad7..0f912af74f118631cbf32c0f80ac58c48ec72144 100644 (file)
--- a/interface/wx/tokenzr.h
+++ b/interface/wx/tokenzr.h
@@ -2,8 +2,7 @@
 // Name:        tokenzr.h
 // Purpose:     interface of wxStringTokenizer
 // Author:      wxWidgets team
 // Name:        tokenzr.h
 // Purpose:     interface of wxStringTokenizer
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -59,6 +58,9 @@ enum wxStringTokenizerMode
     wxTOKEN_STRTOK
 };
 
     wxTOKEN_STRTOK
 };
 

+/// Default wxStringTokenizer delimiters are the usual white space characters.
+#define wxDEFAULT_DELIMITERS " \t\r\n"
+

 /**
     @class wxStringTokenizer
 
 /**
     @class wxStringTokenizer
 


@@ -106,7 +108,7 @@ public:
         @see SetString()
    */
     wxStringTokenizer(const wxString& str,
         @see SetString()
    */
     wxStringTokenizer(const wxString& str,

-                      const wxString& delims = " \t\r\n",
+                      const wxString& delims = wxDEFAULT_DELIMITERS,

                       wxStringTokenizerMode mode = wxTOKEN_DEFAULT);
 
     /**
                       wxStringTokenizerMode mode = wxTOKEN_DEFAULT);
 
     /**


@@ -133,7 +135,7 @@ public:
     wxString GetNextToken();
 
     /**
     wxString GetNextToken();
 
     /**

-        Returns the current position (i.e. one index after the last returned
+        Returns the current position (i.e.\ one index after the last returned

         token or 0 if GetNextToken() has never been called) in the original
         string.
     */
         token or 0 if GetNextToken() has never been called) in the original
         string.
     */


@@ -154,8 +156,8 @@ public:
         containing delimiters, and the @a mode specifying how the string
         should be tokenized.
     */
         containing delimiters, and the @a mode specifying how the string
         should be tokenized.
     */

-    void SetString(const wxString& to_tokenize,
-                   const wxString& delims = " \t\r\n",
+    void SetString(const wxString& str,
+                   const wxString& delims = wxDEFAULT_DELIMITERS,

                    wxStringTokenizerMode mode = wxTOKEN_DEFAULT);
 };
 
                    wxStringTokenizerMode mode = wxTOKEN_DEFAULT);
 };
 


@@ -172,11 +174,11 @@ public:
 
     @return The array with the parsed tokens.
 
 
     @return The array with the parsed tokens.
 

-    @header{wx/string.h}
+    @header{wx/tokenzr.h}

 */
 wxArrayString 
 wxStringTokenize(const wxString& str,
                  const wxString& delims = wxDEFAULT_DELIMITERS,
                  wxStringTokenizerMode mode = wxTOKEN_DEFAULT);
 */
 wxArrayString 
 wxStringTokenize(const wxString& str,
                  const wxString& delims = wxDEFAULT_DELIMITERS,
                  wxStringTokenizerMode mode = wxTOKEN_DEFAULT);

-                 
+

 //@}
 //@}