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

(ugly) compilation fix for wxUSE_STL==1 build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-28 13:12:46 +00:00
parent b55e184291
commit c1daf25293
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/widgets/itemcontainer.cpp
View File

@@ -121,7 +121,7 @@ void ItemContainerWidgetsPage::StartTest(const wxString& label)
wxLogMessage(_T("Test - %s:"), label.c_str());
}
void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
void ItemContainerWidgetsPage::EndTest(const wxMaybeSortedArrayString& items)
{
const unsigned count = m_container->GetCount();
@@ -177,7 +177,7 @@ void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
}
wxString
ItemContainerWidgetsPage::DumpContainerData(const wxArrayString& expected) const
ItemContainerWidgetsPage::DumpContainerData(const wxMaybeSortedArrayString& expected) const
{
wxString str;
str << _T("Current content:\n");
@@ -238,9 +238,9 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
GetWidget()->GetClassInfo()->GetClassName(),
(m_container->IsSorted() ? "Sorted" : "Unsorted"));
const wxArrayString
& expected_result = m_container->IsSorted() ? m_itemsSorted
: m_items;
const wxMaybeSortedArrayString&
expected_result = m_container->IsSorted() ? m_itemsSorted
: m_items;
StartTest(_T("Append one item"));
wxString item = m_items[0];