Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_STL/wxArrayString fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-23 14:33:01 +00:00
parent 99f161bd99
commit a2a03d7864
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/docview.cpp
View File

@@ -1613,7 +1613,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
if (sort) if (sort)
{ {
strings.Sort(wxStringSortAscending); strings.Sort(); // ascending sort
// Yes, this will be slow, but template lists // Yes, this will be slow, but template lists
// are typically short. // are typically short.
int j; int j;
@@ -1692,7 +1692,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
if (sort) if (sort)
{ {
strings.Sort(wxStringSortAscending); strings.Sort(); // ascending sort
// Yes, this will be slow, but template lists // Yes, this will be slow, but template lists
// are typically short. // are typically short.
int j; int j;

4
src/generic/dirctrlg.cpp
View File

@@ -407,9 +407,9 @@ bool wxIsDriveAvailable(const wxString& dirName)
// Function which is called by quick sort. We want to override the default wxArrayString behaviour, // Function which is called by quick sort. We want to override the default wxArrayString behaviour,
// and sort regardless of case. // 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);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
src/html/helpfrm.cpp
View File

@@ -1277,7 +1277,7 @@ void wxHtmlHelpFrame::OptionsDialog()
enu.EnumerateFacenames(); enu.EnumerateFacenames();
m_NormalFonts = new wxArrayString; m_NormalFonts = new wxArrayString;
*m_NormalFonts = *enu.GetFacenames(); *m_NormalFonts = *enu.GetFacenames();
m_NormalFonts->Sort(wxStringSortAscending); m_NormalFonts->Sort(); // ascending sort
} }
if (m_FixedFonts == NULL) if (m_FixedFonts == NULL)
{ {
@@ -1285,7 +1285,7 @@ void wxHtmlHelpFrame::OptionsDialog()
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/); enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/);
m_FixedFonts = new wxArrayString; m_FixedFonts = new wxArrayString;
*m_FixedFonts = *enu.GetFacenames(); *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. // VS: We want to show the font that is actually used by wxHtmlWindow.