removed redundant code

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

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index a13b937e0924473ed5b42c2586b2437ecca2206b..5ffaa706c4e9cc6136f742fb4d58beb97f87897c 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -69,21 +69,15 @@ public:
 
     virtual void DoSetFirstItem(int n);
 
-    virtual void DoSetClientData(int n, void* clientData);
-    virtual void* DoGetClientData(int n) const;
-    virtual void DoSetClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetClientObject(int n) const;
+    virtual void DoSetItemClientData(int n, void* clientData);
+    virtual void* DoGetItemClientData(int n) const;
+    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(int n) const;
 
     // 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();
@@ -94,12 +88,18 @@ public:
 #endif // wxUSE_TOOLTIPS
 
     GtkList   *m_list;
-    wxList     m_clientData;
+    wxList     m_clientList;
 
 #if wxUSE_CHECKLISTBOX
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
+    int        m_prevSelection;
+    bool       m_blockEvent;
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)