X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..3b3fe1f6e766caf35aa3ff4ce0ac01d31699da71:/include/wx/gtk1/choice.h diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index 448c81b988..5f550d732a 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -10,7 +10,7 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choice.h" #endif @@ -55,16 +55,12 @@ public: wxString GetString( int n ) const; void SetString( int n, const wxString& string ); - // implementation +protected: wxList m_clientList; // contains the client data for the items - void DisableEvents(); - void EnableEvents(); - void AppendCommon( const wxString &item ); void ApplyWidgetStyle(); - -protected: 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; @@ -75,7 +71,7 @@ protected: private: // common part of Create() and DoAppend() - size_t AppendHelper(GtkWidget *menu, const wxString& item); + int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item); // this array is only used for controls with wxCB_SORT style, so only // allocate it if it's needed (hence using pointer)