wxUSE_STL/wxArrayString fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 38dd2f9363df35587b92005b94f1b8d980f60289..6e5f2497b73f3175f5a930161649eea831a37b3c 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1613,7 +1613,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 
     if (sort)
     {
-        strings.Sort(wxStringSortAscending);
+        strings.Sort(); // ascending sort
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
@@ -1692,7 +1692,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
 
     if (sort)
     {
-        strings.Sort(wxStringSortAscending);
+        strings.Sort(); // ascending sort
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index f87cb7b8bda7f4d679f314dbcbd7b3bea615f481..66ea7d88fe3f7b51e99b7521b189db549afd68d7 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -407,9 +407,9 @@ bool wxIsDriveAvailable(const wxString& dirName)
 
 // Function which is called by quick sort. We want to override the default wxArrayString behaviour,
 // and sort regardless of case.
-static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(wxString* strFirst, wxString* strSecond)
+static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(const wxString& strFirst, const wxString& strSecond)
 {
-    return strFirst->CmpNoCase(*strSecond);
+    return strFirst.CmpNoCase(strSecond);
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 9b9c95f4366302cc7b323f66910638d4c7421199..51d1bba8e9f52cecebe0df898a286027403d8fad 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -1277,7 +1277,7 @@ void wxHtmlHelpFrame::OptionsDialog()
         enu.EnumerateFacenames();
         m_NormalFonts = new wxArrayString;
         *m_NormalFonts = *enu.GetFacenames();
-        m_NormalFonts->Sort(wxStringSortAscending);
+        m_NormalFonts->Sort(); // ascending sort
     }
     if (m_FixedFonts == NULL)
     {
@@ -1285,7 +1285,7 @@ void wxHtmlHelpFrame::OptionsDialog()
         enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/);
         m_FixedFonts = new wxArrayString;
         *m_FixedFonts = *enu.GetFacenames();
-        m_FixedFonts->Sort(wxStringSortAscending);
+        m_FixedFonts->Sort(); // ascending sort
     }
 
     // VS: We want to show the font that is actually used by wxHtmlWindow.