make it possible to build in ANSI build on Windows again

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

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index fbbd1361174008294a1bb3d49f2e6bfb3ae6a148..c855e3d6884a4d5cc17105aea822ab1c16febf1a 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


@@ -82,7 +85,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,7 +97,7 @@ public:
 
     bool       m_blockEvent;
 
 
     bool       m_blockEvent;
 

-    struct _GtkTreeEntry* GtkGetEntry(int pos) const;
+    struct _GtkTreeEntry* GtkGetEntry(unsigned pos) const;

     void GtkInsertItems(const wxArrayString& items,
                         void** clientData, unsigned int pos);
     void GtkDeselectAll();
     void GtkInsertItems(const wxArrayString& items,
                         void** clientData, unsigned int pos);
     void GtkDeselectAll();


@@ -116,10 +119,19 @@ protected:
     virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
     virtual int DoListHitTest(const wxPoint& point) const;
 
     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;
+
+    // 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);
+

 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_