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

fix Alt-letter navigation with spin controls (bug 672974)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-03-24 18:55:42 +00:00
parent d8103d31f7
commit c5c04fabb0
3 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/toback24.txt
View File

@ -454,3 +454,15 @@ Checking in src/msw/button.cpp;
/pack/cvsroots/wxwindows/wxWindows/src/msw/button.cpp,v <-- button.cpp
new revision: 1.59; previous revision: 1.58
39. Alt-letter didn't switch focus to a spin ctrl following static control
with "&letter" accel
http://sf.net/tracker/index.php?func=detail&aid=672974&group_id=9863&atid=109863
Checking in src/msw/spinctrl.cpp;
/pack/cvsroots/wxwindows/wxWindows/src/msw/spinctrl.cpp,v <-- spinctrl.cpp
new revision: 1.24; previous revision: 1.23
Checking in include/wx/msw/spinctrl.h;
/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/spinctrl.h,v <-- spinctrl.h
new revision: 1.16; previous revision: 1.15

1
include/wx/msw/spinctrl.h
View File

@ -100,6 +100,7 @@ protected:
// Handle processing of special keys
void OnChar(wxKeyEvent& event);
void OnSetFocus(wxFocusEvent& event);
// the data for the "buddy" text ctrl
WXHWND m_hwndBuddy;

46
src/msw/spinctrl.cpp
View File

@ -54,6 +54,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
EVT_CHAR(wxSpinCtrl::OnChar)
EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
END_EVENT_TABLE()
@ -90,6 +93,12 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
switch ( message )
{
case WM_SETFOCUS:
// if the focus comes from the spin control itself, don't set it
// back to it -- we don't want to go into an infinite loop
if ( wParam == spin->GetHWND() )
break;
//else: fall through
case WM_KILLFOCUS:
case WM_CHAR:
case WM_DEADCHAR:
@ -197,6 +206,15 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
event.Skip();
}
void wxSpinCtrl::OnSetFocus(wxFocusEvent& event)
{
// when we get focus, give it to our buddy window as it needs it more than
// we do
::SetFocus((HWND)m_hwndBuddy);
event.Skip();
}
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
@ -239,14 +257,13 @@ bool wxSpinCtrl::Create(wxWindow *parent,
wxPoint posBtn(pos);
posBtn.x += sizeText.x + MARGIN_BETWEEN;
// create the spin button
if ( !wxSpinButton::Create(parent, id, posBtn, sizeBtn, style, name) )
{
return FALSE;
}
// we must create the text control before the spin button for the purpose
// of the dialog navigation: if there is a static text just before the spin
// control, activating it by Alt-letter should give focus to the text
// control, not the spin and the dialog navigation code will give focus to
// the next control (at Windows level), not the one after it
SetRange(min, max);
SetValue(initial);
// create the text window
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
@ -260,13 +277,12 @@ bool wxSpinCtrl::Create(wxWindow *parent,
if ( style & wxCLIP_SIBLINGS )
msStyle |= WS_CLIPSIBLINGS;
// create the text window
m_hwndBuddy = (WXHWND)::CreateWindowEx
(
exStyle, // sunken border
exStyle, // sunken border
_T("EDIT"), // window class
NULL, // no window title
msStyle /* | WS_CLIPSIBLINGS */, // style (will be shown later)
msStyle, // style (will be shown later)
pos.x, pos.y, // position
0, 0, // size (will be set later)
GetHwndOf(parent), // parent
@ -282,6 +298,16 @@ bool wxSpinCtrl::Create(wxWindow *parent,
return FALSE;
}
// create the spin button
if ( !wxSpinButton::Create(parent, id, posBtn, sizeBtn, style, name) )
{
return FALSE;
}
SetRange(min, max);
SetValue(initial);
// subclass the text ctrl to be able to intercept some events
m_wndProcBuddy = (WXFARPROC)::GetWindowLong(GetBuddyHwnd(), GWL_WNDPROC);
::SetWindowLong(GetBuddyHwnd(), GWL_USERDATA, (LONG)this);