don't pass unnecessary arguments to FindOrCreateBrush/Pen()

[wxWidgets.git] / include / wx / gtk / listbox.h

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index fbbd1361174008294a1bb3d49f2e6bfb3ae6a148..c80a2d7123f58e4545be3c090881f1789c013735 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -7,8 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKLISTBOXH__
-#define __GTKLISTBOXH__
+#ifndef _WX_GTK_LISTBOX_H_
+#define _WX_GTK_LISTBOX_H_
+
+struct _GtkTreeEntry;
+struct _GtkTreeIter;

 
 //-----------------------------------------------------------------------------
 // wxListBox
 
 //-----------------------------------------------------------------------------
 // wxListBox


@@ -61,10 +64,6 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 
                 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);
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);


@@ -74,6 +73,8 @@ public:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 

+    virtual void EnsureVisible(int n);
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 


@@ -82,7 +83,7 @@ public:
     GtkWidget *GetConnectWidget();
 
 #if wxUSE_TOOLTIPS
     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;
 #endif // wxUSE_TOOLTIPS
 
     struct _GtkTreeView   *m_treeview;


@@ -94,32 +95,44 @@ public:
 
     bool       m_blockEvent;
 
 
     bool       m_blockEvent;
 

-    struct _GtkTreeEntry* GtkGetEntry(int pos) const;
-    void GtkInsertItems(const wxArrayString& items,
-                        void** clientData, unsigned int pos);
+    struct _GtkTreeEntry* GtkGetEntry(unsigned pos) const;

     void GtkDeselectAll();
     void GtkSetSelection(int n, const bool select, const bool blockEvent);
 
 protected:
     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 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 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;
 
     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;
+
+    // get the index for the given iterator, return wxNOT_FOUND on failure
+    int GtkGetIndexFor(_GtkTreeIter& iter) const;
+
+    // set the specified item
+    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
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 
 private:
     void Init(); //common construction
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 

-#endif // __GTKLISTBOXH__
+#endif // _WX_GTK_LISTBOX_H_