Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with SetValue on read-only combobox; don't call ::SetWindowText,

Browse Source 
use SetStringSelection instead.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-09-06 16:53:02 +00:00
parent fc8eba27ef
commit b38f3ff378
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/msw/combobox.cpp
View File

@@ -376,9 +376,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
void wxComboBox::SetValue(const wxString& value)
{
// If newlines are denoted by just 10, must stick 13 in front.
int singletons = 0;
int len = value.Length();
int i;
size_t singletons = 0;
size_t len = value.Length();
size_t i;
for (i = 0; i < len; i ++)
{
if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
@@ -386,8 +386,9 @@ void wxComboBox::SetValue(const wxString& value)
}
if (singletons > 0)
{
wxChar *tmp = new wxChar[len + singletons + 1];
int j = 0;
wxString tmp;
tmp.Alloc(len + singletons);
size_t j = 0;
for (i = 0; i < len; i ++)
{
if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
@@ -398,12 +399,16 @@ void wxComboBox::SetValue(const wxString& value)
tmp[j] = value[i];
j ++;
}
tmp[j] = 0;
SetWindowText(GetHwnd(), tmp);
delete[] tmp;
if (GetWindowStyle() & wxCB_READONLY)
SetStringSelection(tmp);
else
SetWindowText(GetHwnd(), tmp.c_str());
}
else
SetWindowText(GetHwnd(), value);
if (GetWindowStyle() & wxCB_READONLY)
SetStringSelection(value);
else
SetWindowText(GetHwnd(), value.c_str());
}
// Clipboard operations