don't define, nor use, LVS_EX_LABELTIP under WinCE

[wxWidgets.git] / include / wx / generic / bmpcbox.h

diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index e1c963d4f1c4ec8aa09b4cde20403d35651a32d9..e192470c4e8aca47301acf97dea8c085a4d4cae1 100644 (file)
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Aug-30-2006
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -86,13 +86,17 @@ public:
     virtual ~wxBitmapComboBox();
 
     // Adds item with image to the end of the combo box.
-    int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap)
-        { return DoAppendWithImage(item, bitmap); }
+    int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap);
+    int Append(const wxString& item, const wxBitmap& bitmap, void *clientData);
+    int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData);
 
-    int Append(const wxString& item, const wxBitmap& bitmap, void *clientData)
-        { int n = DoAppendWithImage(item, bitmap); SetClientData(n, clientData); return n; }
-    int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData)
-        { int n = DoAppendWithImage(item, bitmap); SetClientObject(n, clientData); return n; }
+    // Inserts item with image into the list before pos. Not valid for wxCB_SORT
+    // styles, use Append instead.
+    int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos);
+    int Insert(const wxString& item, const wxBitmap& bitmap,
+               unsigned int pos, void *clientData);
+    int Insert(const wxString& item, const wxBitmap& bitmap,
+               unsigned int pos, wxClientData *clientData);
 
     // Returns size of image used in list.
     virtual wxSize GetBitmapSize() const
@@ -103,21 +107,11 @@ public:
     // Returns the image of the item with the given index.
     virtual wxBitmap GetItemBitmap(unsigned int n) const;
 
-    // Inserts item with image into the list before pos. Not valid for wxCB_SORT or wxCB_SORT
-    // styles, use Append instead.
-    int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos)
-        { return DoInsertWithImage(item, bitmap, pos); }
-
-    int Insert(const wxString& item, const wxBitmap& bitmap,
-               unsigned int pos, void *clientData);
-    int Insert(const wxString& item, const wxBitmap& bitmap,
-               unsigned int pos, wxClientData *clientData);
-
     // Sets the image for the given item.
     virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);
 
-    virtual void Clear();
-    virtual void Delete(unsigned int n);
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
 
 protected:
 
@@ -126,12 +120,9 @@ protected:
     virtual wxCoord OnMeasureItem(size_t item) const;
     virtual wxCoord OnMeasureItemWidth(size_t item) const;
 
-    virtual int DoAppendWithImage(const wxString& item, const wxBitmap& bitmap);
-    virtual int DoInsertWithImage(const wxString& item, const wxBitmap& bitmap,
-                                  unsigned int pos);
-
-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, unsigned int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 
     virtual bool SetFont(const wxFont& font);