*** empty log message ***

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

diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index 7942996e29ed987377b378f6b9b1237207a7b724..1668cd47ba6d48ee0bdc262e89100f56dd572ce8 100644 (file)
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -18,23 +18,40 @@
 
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"

+#include "wx/filefn.h"

 
 

-class wxStringTokenizer : wxObject {
+class WXDLLEXPORT wxStringTokenizer : public wxObject
+{

 public:
 public:

-  wxStringTokenizer(const wxString& to_tokenize,
-                    const wxString& delims = " \t\r\n",
-                    bool ret_delim = FALSE);
-  ~wxStringTokenizer();
-
-  int CountTokens();
-  bool HasMoreToken();
-  wxString NextToken();
-  wxString GetString() { return m_string; }
-protected:
-  off_t FindDelims(const wxString& str, const wxString& delims);
+    wxStringTokenizer(const wxString& to_tokenize,
+                      const wxString& delims = " \t\r\n",
+                      bool ret_delim = FALSE);
+    wxStringTokenizer() { m_retdelims = FALSE;}
+    virtual ~wxStringTokenizer();
+
+    int CountTokens() const;
+    bool HasMoreTokens();
+
+    wxString NextToken();
+    wxString GetNextToken() { return NextToken(); };
+
+    wxString GetString() const { return m_string; }
+
+    void SetString(const wxString& to_tokenize,
+                   const wxString& delims = " \t\r\n",
+                   bool ret_delim = FALSE)
+    {
+        m_string = to_tokenize;
+        m_delims = delims;
+        m_retdelims = ret_delim;
+    }
+

 protected:
 protected:

-  wxString m_string, m_delims;
-  bool m_retdelims;
+    off_t FindDelims(const wxString& str, const wxString& delims) const;
+    void EatLeadingDelims();
+
+    wxString m_string, m_delims;
+    bool m_retdelims;

 };
 
 };
 

-#endif
+#endif // _WX_TOKENZRH