Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index 9a08ddb460bb7f147d006dc55269fd0a1579092e..e9e11c30df9d5612a65fe73336b90fc3d908a897 100644 (file)
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -2,7 +2,7 @@
 // Name:        wx/tokenzr.h
 // Purpose:     String tokenizer - a C++ replacement for strtok(3)
 // Author:      Guilhem Lavaux
 // Name:        wx/tokenzr.h
 // Purpose:     String tokenizer - a C++ replacement for strtok(3)
 // Author:      Guilhem Lavaux

-// Modified by: Vadim Zeitlin
+// Modified by: (or rather rewritten by) Vadim Zeitlin

 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux


@@ -92,7 +92,7 @@ public:
     // compatibility only, don't use
     void SetString(const wxString& to_tokenize,
                    const wxString& delims,
     // compatibility only, don't use
     void SetString(const wxString& to_tokenize,
                    const wxString& delims,

-                   bool ret_delim)
+                   bool WXUNUSED(ret_delim))

     {
         SetString(to_tokenize, delims, wxTOKEN_RET_DELIMS);
     }
     {
         SetString(to_tokenize, delims, wxTOKEN_RET_DELIMS);
     }


@@ -117,4 +117,15 @@ protected:
     bool     m_hasMore;             // do we have more (possible empty) tokens?
 };
 
     bool     m_hasMore;             // do we have more (possible empty) tokens?
 };
 

+// ----------------------------------------------------------------------------
+// convenience function which returns all tokens at once
+// ----------------------------------------------------------------------------
+
+// the function takes the same parameters as wxStringTokenizer ctor and returns
+// the array containing all tokens
+wxArrayString WXDLLEXPORT
+wxStringTokenize(const wxString& str,
+                 const wxString& delims = wxDEFAULT_DELIMITERS,
+                 wxStringTokenizerMode mode = wxTOKEN_DEFAULT);
+

 #endif // _WX_TOKENZRH
 #endif // _WX_TOKENZRH