From b7b8dc1b89e3a56a05c7eda337c082a50c321459 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 16 Nov 2011 13:38:30 +0000 Subject: [PATCH] MGR: use wxBitMapComboBox insert and append calls without client data argument svn path=/trunk/boinc/; revision=24609 --- checkin_notes | 8 ++++++++ clientgui/BOINCBitmapComboBox.cpp | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index a5dd971179..20c69b6c31 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7752,6 +7752,7 @@ Charlie 25 Oct 2011 around clientData bug in wxBitmapComboBox::Insert(). clientgui/ + BOINCBitmapComboBox.cpp,.h (added) mac/ MacBitmapComboBox.cpp,.h sg_PanelBase.h @@ -8493,3 +8494,10 @@ David 14 Nov 2011 client/ log_flags.cpp pers_file_xfer.cpp + +Charlie 16 Nov 2011 + - MGR: use wxBitMapComboBox insert and append calls without client + data argument. + + clientgui/ + BOINCBitmapComboBox.cpp,.h (added) diff --git a/clientgui/BOINCBitmapComboBox.cpp b/clientgui/BOINCBitmapComboBox.cpp index 0c70efa582..e28de1bda6 100644 --- a/clientgui/BOINCBitmapComboBox.cpp +++ b/clientgui/BOINCBitmapComboBox.cpp @@ -76,7 +76,7 @@ int CBOINCBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap) { int CBOINCBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap, void *clientData) { m_pClientData.push_back(clientData); - int n = wxBitmapComboBox::Append(item, bitmap, (void*)NULL); + int n = wxBitmapComboBox::Append(item, bitmap); return n; } @@ -92,7 +92,7 @@ int CBOINCBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, u int CBOINCBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, void *clientData) { std::vector::iterator insertionPoint = m_pClientData.begin(); m_pClientData.insert(insertionPoint + pos, clientData); - int n = wxBitmapComboBox::Insert(item, bitmap, pos, (void*)NULL); + int n = wxBitmapComboBox::Insert(item, bitmap, pos); return n; }