Missing "c" bug should be gone.

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

diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp
index 373a92f5b9f1c0ff3b8e6061d0be692d4972b08d..b39029807adac62958837e68ba1e70aa47335519 100644 (file)
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
@@ -24,7 +24,7 @@
 
 #ifdef M_BASEDIR
 #   include "gui/wxllist.h"
 
 #ifdef M_BASEDIR
 #   include "gui/wxllist.h"

-#   define  SHOW_SELECTIONS 0
+#   define  SHOW_SELECTIONS 1

 #else
 #   include "wxllist.h"
 #   define SHOW_SELECTIONS 1
 #else
 #   include "wxllist.h"
 #   define SHOW_SELECTIONS 1

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index ec312923ac2bfa7e1f820958e27ed3617f73488c..8902e04eff69b9a5d8272c7aed41cfc2104d166a 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -260,11 +260,10 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
    case WXK_END:
       m_llist->MoveCursorToEndOfLine();
       break;
    case WXK_END:
       m_llist->MoveCursorToEndOfLine();
       break;

-   case 'c':
-      if(event.ControlDown())
+   default:
+      if(keyCode == 'c' && event.ControlDown())

          Copy();
       break;
          Copy();
       break;

-   default:

       if( IsEditable() )
       {
          /* First, handle control keys */
       if( IsEditable() )
       {
          /* First, handle control keys */