X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82c591d771cb651b7d54e1eada7c33da962e3831..d2b23b67301bd2d286366d4326a21da3132558fa:/src/msw/control.cpp?ds=sidebyside

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 05370f4505..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);
 
@@ -187,7 +191,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 #if wxUSE_TREECTRL
         if ( wxDynamicCastThis(wxTreeCtrl) )
             testFont = true;
-#endif wxUSE_TREECTRL
+#endif // wxUSE_TREECTRL
 
         if ( testFont )
         {
@@ -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;
     }