Merge of SOC2010_RTC_IMAGES branch.

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

diff --git a/include/wx/palmos/listbox.h b/include/wx/palmos/listbox.h
index 6deb42c9ff80570c6022d70cfd946cb29a7626b1..9cbd0a71a29466f3251b7c9bb9a810f12c0f2b0b 100644 (file)
--- a/include/wx/palmos/listbox.h
+++ b/include/wx/palmos/listbox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 

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

 #if wxUSE_LISTBOX
 
 // ----------------------------------------------------------------------------
 #if wxUSE_LISTBOX
 
 // ----------------------------------------------------------------------------


@@ -23,7 +19,7 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN

-  class WXDLLEXPORT wxOwnerDrawn;
+  class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;

 
   // define the array of list box items
   #include  "wx/dynarray.h"
 
   // define the array of list box items
   #include  "wx/dynarray.h"


@@ -38,7 +34,7 @@ class wxArrayInt;
 // List box control
 // ----------------------------------------------------------------------------
 
 // List box control
 // ----------------------------------------------------------------------------
 

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

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


@@ -82,29 +78,26 @@ public:
     virtual ~wxListBox();
 
     // implement base class pure virtuals
     virtual ~wxListBox();
 
     // 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 bool IsSelected(int n) const;
 
     virtual bool IsSelected(int n) const;

-    virtual void SetSelection(int n, bool select = TRUE);
+    virtual void DoSetSelection(int n, bool select);

     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     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;

 
     // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN
 
     // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN


@@ -146,7 +139,6 @@ protected:
     // free memory (common part of Clear() and dtor)
     void Free();
 
     // free memory (common part of Clear() and dtor)
     void Free();
 

-    int m_noItems;

     int m_selected;
 
     virtual wxSize DoGetBestSize() const;
     int m_selected;
 
     virtual wxSize DoGetBestSize() const;