X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..05e3a383e0bff29b830f91b6b40e63a3b1a3e72f:/include/wx/tokenzr.h?ds=sidebyside diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h index e9e11c30df..08d39f0938 100644 --- a/include/wx/tokenzr.h +++ b/include/wx/tokenzr.h @@ -12,12 +12,13 @@ #ifndef _WX_TOKENZRH #define _WX_TOKENZRH -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "tokenzr.h" #endif #include "wx/object.h" #include "wx/string.h" +#include "wx/arrstr.h" // ---------------------------------------------------------------------------- // constants @@ -41,7 +42,7 @@ enum wxStringTokenizerMode // wxStringTokenizer: replaces infamous strtok() and has some other features // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStringTokenizer : public wxObject +class WXDLLIMPEXP_BASE wxStringTokenizer : public wxObject { public: // ctors and initializers @@ -123,7 +124,7 @@ protected: // the function takes the same parameters as wxStringTokenizer ctor and returns // the array containing all tokens -wxArrayString WXDLLEXPORT +wxArrayString WXDLLIMPEXP_BASE wxStringTokenize(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT);