Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index 45b330c515c834a7b86794fb6bd3d70b9a136344..c40bda6a2735a50a649b189b40d7a5bcd5680c64 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/listbox.h
 // Purpose:     wxListBox class declaration
 // Author:      Robert Roebling
 // Name:        wx/gtk/listbox.h
 // Purpose:     wxListBox class declaration
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,7 +9,7 @@
 #ifndef _WX_GTK_LISTBOX_H_
 #define _WX_GTK_LISTBOX_H_
 
 #ifndef _WX_GTK_LISTBOX_H_
 #define _WX_GTK_LISTBOX_H_
 

-struct _GtkTreeEntry;
+struct _wxTreeEntry;

 struct _GtkTreeIter;
 
 //-----------------------------------------------------------------------------
 struct _GtkTreeIter;
 
 //-----------------------------------------------------------------------------


@@ -82,11 +81,7 @@ public:
 
     // implementation from now on
 
 
     // implementation from now on
 

-    GtkWidget *GetConnectWidget();
-
-#if wxUSE_TOOLTIPS
-    void GTKApplyToolTip( GtkTooltips *tips, const gchar *tip );
-#endif // wxUSE_TOOLTIPS
+    virtual GtkWidget *GetConnectWidget();

 
     struct _GtkTreeView   *m_treeview;
     struct _GtkListStore  *m_liststore;
 
     struct _GtkTreeView   *m_treeview;
     struct _GtkListStore  *m_liststore;


@@ -95,11 +90,14 @@ public:
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 

-    struct _GtkTreeEntry* GTKGetEntry(unsigned pos) const;
+    struct _wxTreeEntry* GTKGetEntry(unsigned pos) const;

 
     void GTKDisableEvents();
     void GTKEnableEvents();
 
 
     void GTKDisableEvents();
     void GTKEnableEvents();
 

+    void GTKOnSelectionChanged();
+    void GTKOnActivated(int item);
+

 protected:
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);
 protected:
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);


@@ -112,6 +110,7 @@ protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);

+    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);

 
     virtual void DoSetFirstItem(int n);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
 
     virtual void DoSetFirstItem(int n);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);


@@ -124,9 +123,6 @@ protected:
     // get the index for the given iterator, return wxNOT_FOUND on failure
     int GTKGetIndexFor(_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);
 
     // common part of DoSetFirstItem() and EnsureVisible()
     void DoScrollToCell(int n, float alignY, float alignX);