Fixed wxSplitterEvent to set it's id to be the splitter window's id so

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

diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index c23d130185e27c2fe8f456df2064c6cbe6f933da..1668cd47ba6d48ee0bdc262e89100f56dd572ce8 100644 (file)
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -20,33 +20,38 @@
 #include "wx/string.h"
 #include "wx/filefn.h"
 
 #include "wx/string.h"
 #include "wx/filefn.h"
 

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

 public:
 public:

-  wxStringTokenizer(const wxString& to_tokenize,
-                    const wxString& delims = " \t\r\n",
-                    bool ret_delim = FALSE);
-  wxStringTokenizer() {  m_string = "";  m_delims = "";  m_retdelims = FALSE;}
-  ~wxStringTokenizer();
-
-  int CountTokens();
-  bool HasMoreToken();
-  wxString NextToken();
-  wxString GetString() { 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;
-  }
+    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:

-  off_t FindDelims(const wxString& str, const wxString& delims);
-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