Fixed operator[] recursion

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

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 10b0107526e0372d481a7e7fe0912856855cdfef..1976ebf2a2ede0ade9af8bb2495d0a256865bc91 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -11,12 +11,14 @@
 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 
 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "listbox.h"

 #endif
 
 #include "wx/list.h"
 
 #endif
 
 #include "wx/list.h"
 

+class WXDLLIMPEXP_BASE wxSortedArrayString;
+

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


@@ -76,14 +78,8 @@ public:
 
     // implementation from now on
 
 
     // implementation from now on
 

-#if wxUSE_DRAG_AND_DROP
-    void SetDropTarget( wxDropTarget *dropTarget );
-#endif
-
-    void DisableEvents();
-    void EnableEvents();
-    void AppendWithoutSorting( const wxString &item );
-    int GetIndex( GtkWidget *item ) const;
+    void GtkAddItem( const wxString &item, int pos=-1 );
+    int GtkGetIndex( GtkWidget *item ) const;

     GtkWidget *GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     GtkWidget *GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();


@@ -94,12 +90,23 @@ public:
 #endif // wxUSE_TOOLTIPS
 
     GtkList   *m_list;
 #endif // wxUSE_TOOLTIPS
 
     GtkList   *m_list;

-    wxList     m_clientData;
+    wxList     m_clientList;

 
 #if wxUSE_CHECKLISTBOX
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 

+    int        m_prevSelection;
+    bool       m_blockEvent;
+
+    virtual void FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y);
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    // return the string label for the given item
+    wxString GetRealLabel(struct _GList *item) const;
+

 private:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
 private:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)