AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't set focus to radiobox in SetSelection() (patch 759456)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-07-19 18:52:29 +00:00
parent 449110cd74
commit 974931fefa
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/radiobox.cpp
View File

@ -332,7 +332,6 @@ void wxRadioBox::SetSelection(int N)
::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L); ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);
::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
::SetFocus((HWND)m_radioButtons[N]);
m_selectedButton = N; m_selectedButton = N;
} }
@ -634,10 +633,9 @@ void wxRadioBox::SetFocus()
{ {
if (m_noItems > 0) if (m_noItems > 0)
{ {
if (m_selectedButton == -1) ::SetFocus((HWND)m_radioButtons[m_selectedButton == -1
::SetFocus((HWND) m_radioButtons[0]); ? 0
else : m_selectedButton]);
::SetFocus((HWND) m_radioButtons[m_selectedButton]);
} }
} }
@ -701,6 +699,7 @@ bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
void wxRadioBox::Command(wxCommandEvent & event) void wxRadioBox::Command(wxCommandEvent & event)
{ {
SetSelection (event.m_commandInt); SetSelection (event.m_commandInt);
SetFocus();
ProcessCommand (event); ProcessCommand (event);
} }
@ -708,8 +707,6 @@ void wxRadioBox::Command(wxCommandEvent & event)
// radiobox pointer in GWL_USERDATA for radio buttons must be updated too! // radiobox pointer in GWL_USERDATA for radio buttons must be updated too!
void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
{ {
// No GWL_USERDATA in Win16, so omit this subclassing.
#ifdef __WIN32__
HWND hwndBtn = (HWND)hWndBtn; HWND hwndBtn = (HWND)hWndBtn;
if ( !s_wndprocRadioBtn ) if ( !s_wndprocRadioBtn )
@ -717,7 +714,6 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
#endif // __WIN32__
} }
void wxRadioBox::SendNotificationEvent() void wxRadioBox::SendNotificationEvent()
@ -933,6 +929,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
if ( selNew != selOld ) if ( selNew != selOld )
{ {
radiobox->SetSelection(selNew); radiobox->SetSelection(selNew);
radiobox->SetFocus();
// emulate the button click // emulate the button click
radiobox->SendNotificationEvent(); radiobox->SendNotificationEvent();