Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: use wxBitMapComboBox insert and append calls without client data argument 

svn path=/trunk/boinc/; revision=24609
This commit is contained in:
Charlie Fenton 2011-11-16 13:38:30 +00:00
parent ae7681c026
commit b7b8dc1b89
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -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)

4
clientgui/BOINCBitmapComboBox.cpp
View File

@ -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<void*>::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;
}