X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..f96b10c283479129b2adfb1b925bf8b39e443bdd:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 6acce9a5de..a6e0ecd1be 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -10,10 +10,12 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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)