Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/samples/widgets/itemcontainer.h b/samples/widgets/itemcontainer.h
index 30d79ec558b5299cd0d84508147cf9bee64296cc..06b1231da312cbbf588e2e4212e0f7daefc25ba5 100644 (file)
--- a/samples/widgets/itemcontainer.h
+++ b/samples/widgets/itemcontainer.h
@@ -4,15 +4,12 @@
 // Purpose:     Part of the widgets sample showing wxComboBox
 // Created:     20.07.07
 // Id:          $Id$
 // Purpose:     Part of the widgets sample showing wxComboBox
 // Created:     20.07.07
 // Id:          $Id$

-// License:     wxWindows license
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 class ItemContainerWidgetsPage : public WidgetsPage
 #include "widgets.h"
 
 class ItemContainerWidgetsPage : public WidgetsPage


@@ -20,7 +17,7 @@ class ItemContainerWidgetsPage : public WidgetsPage
 public:
     ItemContainerWidgetsPage(WidgetsBookCtrl *book,
                              wxImageList *image_list,
 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);


@@ -42,6 +39,8 @@ private:
 
     wxString DumpContainerData(const wxArrayString& expected) const;
 
 
     wxString DumpContainerData(const wxArrayString& expected) const;
 

+    static wxArrayString MakeArray(const wxSortedArrayString& sorted);
+

     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;
     int m_trackedDataObjects;
     wxArrayString       m_items;
     wxSortedArrayString m_itemsSorted;
     int m_trackedDataObjects;