Fix tracking rectangles in 64-bit build by remembering the tag as the 64-bit integer...

[wxWidgets.git] / include / wx / choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 16017f87ec36cc993b2e54820f1c35d6e6d32c69..69cab9702eaaefe0fffac2dc91a73d5eed1b1096 100644 (file)
--- 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)
 };