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

fixed warnings about possibly uninitialized variables; commented non trivial piece of code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-21 12:45:24 +00:00
parent ba30efbc53
commit 5301d1f7aa
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/msw/combobox.cpp
View File

@@ -241,31 +241,28 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{ {
bool isSize = false; // TODO: handle WM_CTLCOLOR messages from our EDIT control to be able to
long fromOld, toOld; // set its colour correctly (to be the same as our own one)
// handle WM_CTLCOLOR messages from our EDIT control to be able to set its
// colour correctly (to be the same as our own one)
switch ( nMsg ) switch ( nMsg )
{ {
case CB_SETCURSEL: case CB_SETCURSEL:
// Selection was set with SetSelection. Update the value too. // Selection was set with SetSelection. Update the value too.
if ((int)wParam > GetCount()) if ((int)wParam > GetCount())
m_value = wxEmptyString; m_value.clear();
else else
m_value = GetString(wParam); m_value = GetString(wParam);
m_selectionOld = -1; m_selectionOld = -1;
break; break;
case WM_SIZE:
GetSelection(&fromOld, &toOld);
isSize = true;
break;
}
case WM_SIZE:
{
// combobox selection sometimes spontaneously changes when its
// size changes, restore it to the old value if necessary
long fromOld, toOld;
GetSelection(&fromOld, &toOld);
WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam); WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
if(isSize)
{
long fromNew, toNew; long fromNew, toNew;
GetSelection(&fromNew, &toNew); GetSelection(&fromNew, &toNew);
@@ -273,10 +270,13 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
{ {
SetSelection(fromOld, toOld); SetSelection(fromOld, toOld);
} }
}
return result; return result;
} }
}
return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
}
bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
{ {