Removed a deprecated wxBitmap constructor, and some

[wxWidgets.git] / src / os2 / textctrl.cpp

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 1e4d42ab489439df24a90162795577ce5c47b159..3b2b97719ae88dcd3cc30684b3c86ecc72de1200 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -1171,9 +1171,11 @@ void wxTextCtrl::AdjustSpaceLimit()
 bool wxTextCtrl::AcceptsFocus() const
 {
     //
-    // We don't want focus if we can't be edited
+    // We don't want focus if we can't be edited unless we're a multiline
+    // control because then it might be still nice to get focus from keyboard
+    // to be able to scroll it without mouse
     //
-    return IsEditable() && wxControl::AcceptsFocus();
+    return (IsEditable() || IsMultiLine()) && wxControl::AcceptsFocus();
 } // end of wxTextCtrl::Command
 
 wxSize wxTextCtrl::DoGetBestSize() const