X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c63312c472c83be6d3b935f0ceeef484a7d611ce..b7527dde394466affd11a1119b030bcd985fd089:/include/wx/choice.h?ds=sidebyside

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 16017f87ec..69cab9702e 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -26,7 +26,7 @@
 // global data
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxChoiceNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings
@@ -55,6 +55,9 @@ public:
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
+    // override wxItemContainer::IsSorted
+    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
+
 private:
     DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };