unused variable, more efficient increment operator

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 1ca6ffd79511d018ad825a48ca8479c777974c6b..dadd741eae889a9430c775abd5dd15ad479bb94f 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -92,6 +92,8 @@ protected:
     void OnLeftUp(wxMouseEvent& event);
 
 private:
     void OnLeftUp(wxMouseEvent& event);
 
 private:

+    friend class wxComboBox; // it accesses our DoGetItemClientData()
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -410,6 +412,11 @@ int wxComboBox::GetSelection() const
 #endif
 }
 
 #endif
 }
 

+void wxComboBox::SetClientDataType(wxClientDataType clientDataItemsType)
+{
+    GetLBox()->SetClientDataType(clientDataItemsType);
+}
+

 int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type)
 int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type)


@@ -419,12 +426,12 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
 
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
 
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {

-    GetLBox()->SetClientData(n, clientData);
+    GetLBox()->DoSetItemClientData(n, clientData);

 }
 
 void *wxComboBox::DoGetItemClientData(unsigned int n) const
 {
 }
 
 void *wxComboBox::DoGetItemClientData(unsigned int n) const
 {

-    return GetLBox()->GetClientData(n);
+    return GetLBox()->DoGetItemClientData(n);

 }
 
 bool wxComboBox::IsEditable() const
 }
 
 bool wxComboBox::IsEditable() const