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

compilation fix in wxUSE_STL case after r54761

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-31 15:05:02 +00:00
parent ad8ae78878
commit 2549484fe5
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/widgets/itemcontainer.cpp
View File

@@ -121,7 +121,7 @@ void ItemContainerWidgetsPage::StartTest(const wxString& label)
wxLogMessage(_T("Test - %s:"), label.c_str()); wxLogMessage(_T("Test - %s:"), label.c_str());
} }
void ItemContainerWidgetsPage::EndTest(const wxMaybeSortedArrayString& items) void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
{ {
const unsigned count = m_container->GetCount(); const unsigned count = m_container->GetCount();
@@ -177,7 +177,7 @@ void ItemContainerWidgetsPage::EndTest(const wxMaybeSortedArrayString& items)
} }
wxString wxString
ItemContainerWidgetsPage::DumpContainerData(const wxMaybeSortedArrayString& expected) const ItemContainerWidgetsPage::DumpContainerData(const wxArrayString& expected) const
{ {
wxString str; wxString str;
str << _T("Current content:\n"); str << _T("Current content:\n");
@@ -229,6 +229,20 @@ bool ItemContainerWidgetsPage::VerifyClientData(wxUIntPtr i, const wxString& str
return true; return true;
} }
/* static */
wxArrayString
ItemContainerWidgetsPage::MakeArray(const wxSortedArrayString& sorted)
{
wxArrayString a;
const size_t count = sorted.size();
a.reserve(count);
for ( size_t n = 0; n < count; n++ )
a.push_back(sorted[n]);
return a;
}
void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&) void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
{ {
m_container = GetContainer(); m_container = GetContainer();
@@ -238,9 +252,9 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
GetWidget()->GetClassInfo()->GetClassName(), GetWidget()->GetClassInfo()->GetClassName(),
(m_container->IsSorted() ? "Sorted" : "Unsorted")); (m_container->IsSorted() ? "Sorted" : "Unsorted"));
const wxMaybeSortedArrayString& const wxArrayString
expected_result = m_container->IsSorted() ? m_itemsSorted expected_result = m_container->IsSorted() ? MakeArray(m_itemsSorted)
: m_items; : m_items;
StartTest(_T("Append one item")); StartTest(_T("Append one item"));
wxString item = m_items[0]; wxString item = m_items[0];

14
samples/widgets/itemcontainer.h
View File

@@ -12,14 +12,6 @@
#include "widgets.h" #include "widgets.h"
// define a common base class for sorted and normal string arrays
#if wxUSE_STL
typedef wxBaseArrayStringBase wxMaybeSortedArrayString;
#else
// in non-STL build wxSortedArrayString derives from wxArrayString
typedef wxArrayString wxMaybeSortedArrayString;
#endif
class ItemContainerWidgetsPage : public WidgetsPage class ItemContainerWidgetsPage : public WidgetsPage
{ {
public: public:
@@ -34,7 +26,7 @@ public:
private: private:
void StartTest(const wxString& label); void StartTest(const wxString& label);
void EndTest(const wxMaybeSortedArrayString& result); void EndTest(const wxArrayString& result);
// Track client data in wxItemContainer instances // Track client data in wxItemContainer instances
wxClientData* CreateClientData(int value); wxClientData* CreateClientData(int value);
@@ -45,7 +37,9 @@ private:
bool VerifyAllClientDataDestroyed(); bool VerifyAllClientDataDestroyed();
bool VerifyClientData(wxUIntPtr i, const wxString& str); bool VerifyClientData(wxUIntPtr i, const wxString& str);
wxString DumpContainerData(const wxMaybeSortedArrayString& expected) const; wxString DumpContainerData(const wxArrayString& expected) const;
static wxArrayString MakeArray(const wxSortedArrayString& sorted);
wxArrayString m_items; wxArrayString m_items;
wxSortedArrayString m_itemsSorted; wxSortedArrayString m_itemsSorted;