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

14
samples/widgets/itemcontainer.h
View File

@@ -12,14 +12,6 @@
#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
{
public:
@@ -34,7 +26,7 @@ public:
private:
void StartTest(const wxString& label);
void EndTest(const wxMaybeSortedArrayString& result);
void EndTest(const wxArrayString& result);
// Track client data in wxItemContainer instances
wxClientData* CreateClientData(int value);
@@ -45,7 +37,9 @@ private:
bool VerifyAllClientDataDestroyed();
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;
wxSortedArrayString m_itemsSorted;