X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..c50f1fb9226d9260454ccb9c8a67d0be23c2827f:/include/wx/msw/listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 7afb83a607..0272e7e047 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
 
 #if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;
@@ -26,18 +26,14 @@ WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
   // define the array of list box items
   #include  <wx/dynarray.h>
 
-  #undef WXDLLEXPORTLOCAL
-  #define WXDLLEXPORTLOCAL WXDLLEXPORT
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
-  #undef  WXDLLEXPORTLOCAL
-  #define WXDLLEXPORTLOCAL
 
 #endif
 
 // forward decl for GetSelections()
 class wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // List box item
 class WXDLLEXPORT wxListBox : public wxControl
@@ -78,11 +74,14 @@ public:
 
     // allows to get the item and use SetXXX functions to set it's appearance
     wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
+
+    // get the index of the given item
+    int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 
     virtual void Append(const wxString& item);
-    virtual void Append(const wxString& item, char *clientData);
-    virtual void Set(int n, const wxString* choices, char **clientData = NULL);
+    virtual void Append(const wxString& item, void *clientData);
+    virtual void Set(int n, const wxString* choices, void **clientData = NULL);
     virtual int FindString(const wxString& s) const ;
     virtual void Clear();
     virtual void SetSelection(int n, bool select = TRUE);
@@ -92,8 +91,8 @@ public:
     // For single choice list item only
     virtual int GetSelection() const ;
     virtual void Delete(int n);
-    virtual char *GetClientData(int n) const ;
-    virtual void SetClientData(int n, char *clientData);
+    virtual void *GetClientData(int n) const ;
+    virtual void SetClientData(int n, void *clientData);
     virtual void SetString(int n, const wxString& s);
 
     // For single or multiple choice list item