X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d5f4ba3b0a2192ecc0ba6d313c1e87ace5c5ad3..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/listbox.h diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h index 245e537752..1c959e0ba6 100644 --- a/include/wx/gtk/listbox.h +++ b/include/wx/gtk/listbox.h @@ -64,10 +64,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); - // implement base class pure virtuals - virtual void Clear(); - virtual void Delete(unsigned int n); - virtual unsigned int GetCount() const; virtual wxString GetString(unsigned int n) const; virtual void SetString(unsigned int n, const wxString& s); @@ -85,7 +81,7 @@ public: GtkWidget *GetConnectWidget(); #if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); + void ApplyToolTip( GtkTooltips *tips, const gchar *tip ); #endif // wxUSE_TOOLTIPS struct _GtkTreeView *m_treeview; @@ -98,25 +94,25 @@ public: bool m_blockEvent; struct _GtkTreeEntry* GtkGetEntry(unsigned pos) const; - void GtkInsertItems(const wxArrayString& items, - void** clientData, unsigned int pos); void GtkDeselectAll(); void GtkSetSelection(int n, const bool select, const bool blockEvent); protected: + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); virtual wxSize DoGetBestSize() const; virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; virtual void DoSetSelection(int n, bool select); - virtual int DoAppend(const wxString& item); - virtual void DoInsertItems(const wxArrayString& items, unsigned int pos); - virtual void DoSetItems(const wxArrayString& items, void **clientData); + + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + virtual void DoSetFirstItem(int n); virtual void DoSetItemClientData(unsigned int n, void* clientData); virtual void* DoGetItemClientData(unsigned int n) const; - virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(unsigned int n) const; virtual int DoListHitTest(const wxPoint& point) const; // get the iterator for the given index, returns false if invalid