no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index ad45a72c7de9814adc92891ff032834a842e5876..be62c96846a0a3d025de2ee00d79dde6ba8e2746 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.h
+// Name:        wx/gtk1/listbox.h

 // Purpose:     wxListBox class declaration
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxListBox class declaration
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,23 +7,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 
 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "listbox.h"
-#endif
-

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

-class WXDLLIMPEXP_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;

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

-class wxListBox : public wxListBoxBase
+class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -37,7 +32,7 @@ public:
             const wxString& name = wxListBoxNameStr )
     {
 #if wxUSE_CHECKLISTBOX
             const wxString& name = wxListBoxNameStr )
     {
 #if wxUSE_CHECKLISTBOX

-        m_hasCheckBoxes = FALSE;
+        m_hasCheckBoxes = false;

 #endif // wxUSE_CHECKLISTBOX
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
 #endif // wxUSE_CHECKLISTBOX
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }


@@ -50,7 +45,7 @@ public:
             const wxString& name = wxListBoxNameStr )
     {
 #if wxUSE_CHECKLISTBOX
             const wxString& name = wxListBoxNameStr )
     {
 #if wxUSE_CHECKLISTBOX

-        m_hasCheckBoxes = FALSE;
+        m_hasCheckBoxes = false;

 #endif // wxUSE_CHECKLISTBOX
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 #endif // wxUSE_CHECKLISTBOX
         Create(parent, id, pos, size, choices, style, validator, name);
     }


@@ -72,33 +67,31 @@ public:
                 const wxString& name = wxListBoxNameStr);
 
     // implement base class pure virtuals
                 const wxString& name = wxListBoxNameStr);
 
     // implement base class pure virtuals

-    virtual void Clear();
-    virtual void Delete(int n);
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

 
 

-    virtual int GetCount() const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
-    virtual int FindString(const wxString& s) const;
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual int FindString(const wxString& s, bool bCase = false) const;

 
     virtual bool IsSelected(int n) const;
     virtual void DoSetSelection(int n, bool select);
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
 
     virtual bool IsSelected(int n) const;
     virtual void DoSetSelection(int n, bool select);
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 

-    virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);

 
     virtual void DoSetFirstItem(int n);
 
 
     virtual void DoSetFirstItem(int n);
 

-    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;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

     // implementation from now on
 
     void GtkAddItem( const wxString &item, int pos=-1 );
     // implementation from now on
 
     void GtkAddItem( const wxString &item, int pos=-1 );