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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/toback24.txt b/docs/toback24.txt
index d38ebfce83b7c317729bf8163a7bc3e46cfa2229..4993ba844ab74c3169a5916cff246a5a55b5ea77 100644 (file)
--- a/docs/toback24.txt
+++ b/docs/toback24.txt
@@ -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
 
 /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
+

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 5d4d2824a25fcf3207da78f96f412d0977e643b4..40acd606bde09cdd0f86037d42d596049ed34958 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -100,6 +100,7 @@ protected:
 
     // Handle processing of special keys
     void OnChar(wxKeyEvent& event);
 
     // Handle processing of special keys
     void OnChar(wxKeyEvent& event);

+    void OnSetFocus(wxFocusEvent& event);

 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;
 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 8cbf378f111db401346aede4c23b38d0de4cbf9e..672b161c2b3144e6901f3f1addbcbe664a437b5d 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -54,6 +54,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)

+
+    EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
+

     EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
 END_EVENT_TABLE()
 
     EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
 END_EVENT_TABLE()
 


@@ -90,6 +93,12 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
     switch ( message )
     {
         case WM_SETFOCUS:
     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:
         case WM_KILLFOCUS:
         case WM_CHAR:
         case WM_DEADCHAR:


@@ -197,6 +206,15 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
     event.Skip();
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------


@@ -239,14 +257,13 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     wxPoint posBtn(pos);
     posBtn.x += sizeText.x + MARGIN_BETWEEN;
 
     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);
 
     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;
 
     if ( style & wxCLIP_SIBLINGS )
         msStyle |= WS_CLIPSIBLINGS;
 

-    // create the text window

     m_hwndBuddy = (WXHWND)::CreateWindowEx
                     (
     m_hwndBuddy = (WXHWND)::CreateWindowEx
                     (

-                     exStyle,       // sunken border
+                     exStyle,                // sunken border

                      _T("EDIT"),             // window class
                      NULL,                   // no window title
                      _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
                      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;
     }
 
         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);
     // subclass the text ctrl to be able to intercept some events
     m_wndProcBuddy = (WXFARPROC)::GetWindowLong(GetBuddyHwnd(), GWL_WNDPROC);
     ::SetWindowLong(GetBuddyHwnd(), GWL_USERDATA, (LONG)this);