X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e5f6c7c609dd0b478b95df672af4093a7a5b3ac..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk/listbox.h

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index c855e3d688..038a53464b 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);
@@ -77,16 +73,16 @@ public:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
+    virtual void EnsureVisible(int n);
+
+    virtual void Update();
+
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation from now on
 
-    GtkWidget *GetConnectWidget();
-
-#if wxUSE_TOOLTIPS
-    void ApplyToolTip( GtkTooltips *tips, const gchar *tip );
-#endif // wxUSE_TOOLTIPS
+    virtual GtkWidget *GetConnectWidget();
 
     struct _GtkTreeView   *m_treeview;
     struct _GtkListStore  *m_liststore;
@@ -95,38 +91,43 @@ public:
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
-    bool       m_blockEvent;
+    struct _GtkTreeEntry* GTKGetEntry(unsigned pos) const;
 
-    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);
+    void GTKDisableEvents();
+    void GTKEnableEvents();
+
+    void GTKOnSelectionChanged();
+    void GTKOnActivated(int item);
 
 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
-    bool GtkGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const;
+    bool GTKGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const;
 
     // get the index for the given iterator, return wxNOT_FOUND on failure
-    int GtkGetIndexFor(_GtkTreeIter& iter) const;
+    int GTKGetIndexFor(_GtkTreeIter& iter) const;
 
     // set the specified item
-    void GtkSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
+    void GTKSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
+
+    // common part of DoSetFirstItem() and EnsureVisible()
+    void DoScrollToCell(int n, float alignY, float alignX);
 
 private:
     void Init(); //common construction