don't call SetInsertionPointToEnd() on read-only combobox in wxGridCellChoiceEditor...

[wxWidgets.git] / samples / widgets / itemcontainer.h

diff --git a/samples/widgets/itemcontainer.h b/samples/widgets/itemcontainer.h
index 30d79ec558b5299cd0d84508147cf9bee64296cc..59e26b308cff997464b811efaf653c46d0d73693 100644 (file)
--- a/samples/widgets/itemcontainer.h
+++ b/samples/widgets/itemcontainer.h
@@ -10,17 +10,22 @@
 #ifndef _WX_SAMPLE_WIDGETS_ITEMCONTAINER_H_
 #define _WX_SAMPLE_WIDGETS_ITEMCONTAINER_H_
 
 #ifndef _WX_SAMPLE_WIDGETS_ITEMCONTAINER_H_
 #define _WX_SAMPLE_WIDGETS_ITEMCONTAINER_H_
 

-// for compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-

 #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
 {
 public:
     ItemContainerWidgetsPage(WidgetsBookCtrl *book,
                              wxImageList *image_list,
 class ItemContainerWidgetsPage : public WidgetsPage
 {
 public:
     ItemContainerWidgetsPage(WidgetsBookCtrl *book,
                              wxImageList *image_list,

-                             char* icon[]);
+                             const char *const icon[]);

     virtual ~ItemContainerWidgetsPage();
 
     void OnButtonTestItemContainer(wxCommandEvent& event);
     virtual ~ItemContainerWidgetsPage();
 
     void OnButtonTestItemContainer(wxCommandEvent& event);


@@ -29,7 +34,7 @@ public:
 
 private:
     void StartTest(const wxString& label);
 
 private:
     void StartTest(const wxString& label);

-    void EndTest(const wxArrayString& result);
+    void EndTest(const wxMaybeSortedArrayString& result);

 
     // Track client data in wxItemContainer instances
     wxClientData* CreateClientData(int value);
 
     // Track client data in wxItemContainer instances
     wxClientData* CreateClientData(int value);


@@ -40,7 +45,7 @@ private:
     bool VerifyAllClientDataDestroyed();
     bool VerifyClientData(wxUIntPtr i, const wxString& str);
 
     bool VerifyAllClientDataDestroyed();
     bool VerifyClientData(wxUIntPtr i, const wxString& str);
 

-    wxString DumpContainerData(const wxArrayString& expected) const;
+    wxString DumpContainerData(const wxMaybeSortedArrayString& expected) const;

 
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;
 
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;