Motif compilation fixes (now ok)

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

diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index 7942996e29ed987377b378f6b9b1237207a7b724..764b4c80919e854b4bd252b376eb51946009fc9f 100644 (file)
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -18,18 +18,33 @@
 
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"

+#include "wx/filefn.h"

 
 

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

 public:
   wxStringTokenizer(const wxString& to_tokenize,
                     const wxString& delims = " \t\r\n",
                     bool ret_delim = FALSE);
 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();
   ~wxStringTokenizer();
 
   int CountTokens();
   bool HasMoreToken();

+  inline bool HasMoreTokens() { return HasMoreToken(); };

   wxString NextToken();
   wxString NextToken();

+  // A better name!
+  inline wxString GetNextToken() { return NextToken(); };

   wxString GetString() { return m_string; }
   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;
+  }
+

 protected:
   off_t FindDelims(const wxString& str, const wxString& delims);
 protected:
 protected:
   off_t FindDelims(const wxString& str, const wxString& delims);
 protected: