X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..a90d7e684a686ac02d3b2453d62615511b04cc32:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 279e80d7fb..19a4defb5a 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -10,10 +10,12 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choice.h" #endif +class WXDLLIMPEXP_BASE wxSortedArrayString; + //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- @@ -60,6 +62,7 @@ protected: void ApplyWidgetStyle(); 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; @@ -68,9 +71,10 @@ protected: virtual wxSize DoGetBestSize() const; + virtual bool IsOwnGtkWindow( GdkWindow *window ); private: // common part of Create() and DoAppend() - size_t GtkAppendHelper(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)