X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec75d791f043b3b43cac9825a2c62e9d5321e616..5180055b697078e8c6ec7db485f1f1bfa3e91abd:/include/wx/motif/choice.h diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h index 070f5191e9..e2ce50b03c 100644 --- a/include/wx/motif/choice.h +++ b/include/wx/motif/choice.h @@ -12,12 +12,10 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choice.h" #endif -WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; - #include "wx/clntdata.h" #include "wx/dynarray.h" @@ -55,6 +53,7 @@ public: // implementation of wxControlWithItems virtual int GetCount() const; virtual int DoAppend(const wxString& item); + virtual int DoInsert(const wxString& item, int pos); virtual void DoSetItemClientData(int n, void* clientData); virtual void* DoGetItemClientData(int n) const; virtual void DoSetItemClientObject(int n, wxClientData* clientData); @@ -94,7 +93,7 @@ protected: // common part of all contructors void Init(); - int m_noStrings; + size_t m_noStrings; WXWidget m_menuWidget; WXWidget m_buttonWidget; wxWidgetArray m_widgetArray;