X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853dcc57c6e5ba58e9e546c65ca4965256f3ac21..0b6cf205888513d5bffb2cd0c13fcde5cf313168:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 5b0526a275..1ae716df6f 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -69,7 +69,7 @@ public: int GetCurrentSelection() const { return GetSelection(); } void SetSelection( int n ); - virtual int GetCount() const; + virtual size_t GetCount() const; virtual int FindString(const wxString& s, bool bCase = false) const; wxString GetString( int n ) const; void SetString( int n, const wxString& string ); @@ -77,6 +77,8 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + virtual bool IsOwnGtkWindow( GdkWindow *window ); + protected: wxList m_clientList; // contains the client data for the items @@ -91,11 +93,9 @@ protected: virtual wxSize DoGetBestSize() const; - virtual bool IsOwnGtkWindow( GdkWindow *window ); - private: // common part of Create() and DoAppend() - int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item); + int GtkAddHelper(GtkWidget *menu, size_t 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)