X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df5168c427b51f1ab2b3200a5c8f7626b3d24aae..955a919785b76a1826e6b8d55f696a0dfb62a318:/include/wx/arrstr.h diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 9573613632..4e559f0fd6 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -15,17 +15,18 @@ #include "wx/defs.h" #include "wx/string.h" -int WXDLLIMPEXP_BASE wxStringSortAscending(wxString*, wxString*); -int WXDLLIMPEXP_BASE wxStringSortDescending(wxString*, wxString*); +WXDLLIMPEXP_BASE int wxStringSortAscending(wxString*, wxString*); +WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*); #if wxUSE_STL #include "wx/dynarray.h" typedef int (*CMPFUNCwxString)(wxString*, wxString*); -WX_DECLARE_EXPORTED_BASEARRAY(wxString, wxBaseArrayStringBase); -WX_DEFINE_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, - wxBaseArrayStringBase); +WX_DECLARE_USER_EXPORTED_BASEARRAY(wxString, wxBaseArrayStringBase, + WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, + wxBaseArrayStringBase, WXDLLIMPEXP_BASE); _WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase, wxBaseArrayStringBase, = wxStringSortAscending, class WXDLLIMPEXP_BASE, CMPFUNCwxString); @@ -201,9 +202,9 @@ public: // FIXME: same in dynarray.h class reverse_iterator { - typedef wxArrayString name; - typedef name::reference reference; - typedef name::pointer pointer; + typedef wxString value_type; + typedef value_type* pointer; + typedef value_type& reference; typedef reverse_iterator itor; friend itor operator+(int o, const itor& it); friend itor operator+(const itor& it, int o); @@ -227,9 +228,9 @@ public: class const_reverse_iterator { - typedef wxArrayString name; - typedef name::const_reference reference; - typedef name::const_pointer pointer; + typedef wxString value_type; + typedef const value_type* pointer; + typedef const value_type& reference; typedef const_reverse_iterator itor; friend itor operator+(int o, const itor& it); friend itor operator+(const itor& it, int o);