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 c80a2d7123f58e4545be3c090881f1789c013735..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;
 
 //-----------------------------------------------------------------------------


@@ -75,16 +74,14 @@ public:
 
     virtual void EnsureVisible(int n);
 
 
     virtual void EnsureVisible(int n);
 

+    virtual void Update();
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation from now on
 
     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;
 
     struct _GtkTreeView   *m_treeview;
     struct _GtkListStore  *m_liststore;


@@ -93,11 +90,13 @@ public:
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 

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

 
 

-    struct _GtkTreeEntry* GtkGetEntry(unsigned pos) const;
-    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();
 
 protected:
     virtual void DoClear();


@@ -111,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);


@@ -118,13 +118,10 @@ protected:
     virtual int DoListHitTest(const wxPoint& point) const;
 
     // get the iterator for the given index, returns false if invalid
     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
 
     // 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);
+    int GTKGetIndexFor(_GtkTreeIter& iter) const;

 
     // 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);