many wxItemContainer-related changes:
1. the main function for item insertion is now DoInsertItems() which allows for much more efficient addition of many new items at once 2. the items client data management is done entirely in wxItemContainer itself, the derived classes don't have to distinguish between void and object client data 3. many fixes for sorted controls, in particular implemented wxCB_SORT support in wxGTK combobox git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
288
samples/widgets/itemcontainer.cpp
Normal file
288
samples/widgets/itemcontainer.cpp
Normal file
@@ -0,0 +1,288 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Program: wxWidgets Widgets Sample
|
||||
// Name: itemcontainer.cpp
|
||||
// Purpose: Part of the widgets sample showing wxComboBox
|
||||
// Created: 20.07.07
|
||||
// Id: $Id$
|
||||
// License: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// ============================================================================
|
||||
// declarations
|
||||
// ============================================================================
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// for compilers that support precompilation, includes "wx/wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
// for all others, include the necessary headers
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/log.h"
|
||||
|
||||
#include "wx/event.h"
|
||||
#endif
|
||||
|
||||
#include "wx/ctrlsub.h"
|
||||
#include "itemcontainer.h"
|
||||
|
||||
|
||||
// Help track client data objects in wxItemContainer instances.
|
||||
class TrackedClientData : public wxClientData
|
||||
{
|
||||
public:
|
||||
|
||||
TrackedClientData(ItemContainerWidgetsPage* tracker, int value)
|
||||
: m_tracker(tracker),
|
||||
m_value(value)
|
||||
{
|
||||
m_tracker->StartTrackingData();
|
||||
}
|
||||
|
||||
virtual ~TrackedClientData()
|
||||
{
|
||||
m_tracker->StopTrackingData();
|
||||
}
|
||||
|
||||
int GetValue() const
|
||||
{
|
||||
return m_value;
|
||||
}
|
||||
|
||||
private:
|
||||
ItemContainerWidgetsPage *m_tracker;
|
||||
int m_value;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(TrackedClientData)
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
ItemContainerWidgetsPage::ItemContainerWidgetsPage(WidgetsBookCtrl *book,
|
||||
wxImageList *image_list,
|
||||
char* icon[])
|
||||
: WidgetsPage(book, image_list, icon), m_trackedDataObjects(0)
|
||||
{
|
||||
m_items.Add(_T("This"));
|
||||
m_items.Add(_T("is"));
|
||||
m_items.Add(_T("a"));
|
||||
m_items.Add(_T("List"));
|
||||
m_items.Add(_T("of"));
|
||||
m_items.Add(_T("strings"));
|
||||
m_itemsSorted = m_items;
|
||||
}
|
||||
|
||||
ItemContainerWidgetsPage::~ItemContainerWidgetsPage()
|
||||
{
|
||||
}
|
||||
|
||||
wxClientData* ItemContainerWidgetsPage::CreateClientData(int value)
|
||||
{
|
||||
return new TrackedClientData(this, value);
|
||||
}
|
||||
|
||||
void ItemContainerWidgetsPage::StartTrackingData()
|
||||
{
|
||||
++m_trackedDataObjects;
|
||||
}
|
||||
|
||||
void ItemContainerWidgetsPage::StopTrackingData()
|
||||
{
|
||||
--m_trackedDataObjects;
|
||||
}
|
||||
|
||||
bool ItemContainerWidgetsPage::VerifyAllClientDataDestroyed()
|
||||
{
|
||||
if ( m_trackedDataObjects )
|
||||
{
|
||||
wxString message = _T("Bug in managing wxClientData: ");
|
||||
if ( m_trackedDataObjects > 0 )
|
||||
message << m_trackedDataObjects << _T(" lost objects");
|
||||
else
|
||||
message << (-m_trackedDataObjects) << _T(" extra deletes");
|
||||
wxFAIL_MSG(message);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ItemContainerWidgetsPage::StartTest(const wxString& label)
|
||||
{
|
||||
m_container->Clear();
|
||||
wxLogMessage(_T("Test - %s:"), label.c_str());
|
||||
}
|
||||
|
||||
void ItemContainerWidgetsPage::EndTest(const wxArrayString& items)
|
||||
{
|
||||
const unsigned count = m_container->GetCount();
|
||||
|
||||
bool ok = count == items.GetCount();
|
||||
if ( !ok )
|
||||
{
|
||||
wxFAIL_MSG(_T("Item count does not match."));
|
||||
}
|
||||
else
|
||||
{
|
||||
for ( unsigned i = 0; i < count; ++i )
|
||||
{
|
||||
wxString str = m_container->GetString(i);
|
||||
if ( str != items[i] )
|
||||
{
|
||||
wxFAIL_MSG(wxString::Format(
|
||||
_T("Wrong string \"%s\" at position %d (expected \"%s\")"),
|
||||
str.c_str(), i, items[i].c_str()));
|
||||
ok = false;
|
||||
break;
|
||||
}
|
||||
|
||||
if ( m_container->HasClientUntypedData() )
|
||||
{
|
||||
void *data = m_container->GetClientData(i);
|
||||
if ( data && !VerifyClientData((wxUIntPtr)data, str) )
|
||||
{
|
||||
ok = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if ( m_container->HasClientObjectData() )
|
||||
{
|
||||
TrackedClientData* obj = (TrackedClientData*)m_container->GetClientObject(i);
|
||||
if ( obj && !VerifyClientData(obj->GetValue(), str) )
|
||||
{
|
||||
ok = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( !ok )
|
||||
{
|
||||
wxLogMessage(DumpContainerData(items));
|
||||
}
|
||||
}
|
||||
|
||||
m_container->Clear();
|
||||
ok &= VerifyAllClientDataDestroyed();
|
||||
|
||||
wxLogMessage(_T("...%s"), ok ? _T("passed") : _T("failed"));
|
||||
}
|
||||
|
||||
wxString
|
||||
ItemContainerWidgetsPage::DumpContainerData(const wxArrayString& expected) const
|
||||
{
|
||||
wxString str;
|
||||
str << _T("Current content:\n");
|
||||
|
||||
unsigned i;
|
||||
for ( i = 0; i < m_container->GetCount(); ++i )
|
||||
{
|
||||
str << _T(" - ") << m_container->GetString(i) << _T(" [");
|
||||
if ( m_container->HasClientObjectData() )
|
||||
{
|
||||
TrackedClientData *
|
||||
obj = (TrackedClientData*)m_container->GetClientObject(i);
|
||||
if ( obj )
|
||||
str << obj->GetValue();
|
||||
}
|
||||
else if ( m_container->HasClientUntypedData() )
|
||||
{
|
||||
void *data = m_container->GetClientData(i);
|
||||
if ( data )
|
||||
str << (wxUIntPtr)data;
|
||||
}
|
||||
str << _T("]\n");
|
||||
}
|
||||
|
||||
str << _T("Expected content:\n");
|
||||
for ( i = 0; i < expected.GetCount(); ++i )
|
||||
{
|
||||
const wxString& item = expected[i];
|
||||
str << _T(" - ") << item << _T("[");
|
||||
for( unsigned j = 0; j < m_items.GetCount(); ++j )
|
||||
{
|
||||
if ( m_items[j] == item )
|
||||
str << j;
|
||||
}
|
||||
str << _T("]\n");
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
bool ItemContainerWidgetsPage::VerifyClientData(wxUIntPtr i, const wxString& str)
|
||||
{
|
||||
if ( i > m_items.GetCount() || m_items[i] != str )
|
||||
{
|
||||
wxLogMessage(_T("Client data for '%s' does not match."), str.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&)
|
||||
{
|
||||
m_container = GetContainer();
|
||||
wxASSERT_MSG(m_container, _T("Widget must have a test widget"));
|
||||
|
||||
wxLogMessage(_T("wxItemContainer test for %s, %s:"),
|
||||
GetWidget()->GetClassInfo()->GetClassName(),
|
||||
(m_container->IsSorted() ? "Sorted" : "Unsorted"));
|
||||
|
||||
const wxArrayString
|
||||
& expected_result = m_container->IsSorted() ? m_itemsSorted
|
||||
: m_items;
|
||||
|
||||
StartTest(_T("Append one item"));
|
||||
wxString item = m_items[0];
|
||||
m_container->Append(item);
|
||||
EndTest(wxArrayString(1, &item));
|
||||
|
||||
StartTest(_T("Append some items"));
|
||||
m_container->Append(m_items);
|
||||
EndTest(expected_result);
|
||||
|
||||
StartTest(_T("Append some items with data objects"));
|
||||
wxClientData **objects = new wxClientData *[m_items.GetCount()];
|
||||
for ( unsigned i = 0; i < m_items.GetCount(); ++i )
|
||||
objects[i] = CreateClientData(i);
|
||||
m_container->Append(m_items, objects);
|
||||
EndTest(expected_result);
|
||||
delete[] objects;
|
||||
|
||||
StartTest(_T("Append some items with data"));
|
||||
void **data = new void *[m_items.GetCount()];
|
||||
for ( unsigned i = 0; i < m_items.GetCount(); ++i )
|
||||
data[i] = (void*)i;
|
||||
m_container->Append(m_items, data);
|
||||
EndTest(expected_result);
|
||||
delete[] data;
|
||||
|
||||
StartTest(_T("Append some items with data, one by one"));
|
||||
for ( unsigned i = 0; i < m_items.GetCount(); ++i )
|
||||
m_container->Append(m_items[i], (void*)i);
|
||||
EndTest(expected_result);
|
||||
|
||||
StartTest(_T("Append some items with data objects, one by one"));
|
||||
for ( unsigned i = 0; i < m_items.GetCount(); ++i )
|
||||
m_container->Append(m_items[i], CreateClientData(i));
|
||||
EndTest(expected_result);
|
||||
|
||||
if ( !m_container->IsSorted() )
|
||||
{
|
||||
StartTest(_T("Insert in reverse order with data, one by one"));
|
||||
for ( unsigned i = m_items.GetCount(); i; --i )
|
||||
m_container->Insert(m_items[i - 1], 0, (void*)(i - 1));
|
||||
EndTest(expected_result);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user