X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28f9f58ca0cff0a771f794fa4c1a1f59af72eb2a..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 8e72df223d..54fd80129e 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -162,6 +162,10 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         return false;
     }
 
+    // saving the label in m_labelOrig to return it verbatim
+    // later in GetLabel()
+    m_labelOrig = label;
+
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
@@ -237,7 +241,7 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
 
-    if ( AcceptsFocus() )
+    if ( AcceptsFocusFromKeyboard() )
     {
         msStyle |= WS_TABSTOP;
     }