[lmi-commits] [5407] Apply wx changeset 70318

[Greg Chicares]

Revision: 5407
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5407
Author:   chicares
Date:     2012-02-24 12:23:46 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
Apply wx changeset 70318

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/wx-2.9.3.patch

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-02-24 11:38:08 UTC (rev 5406)
+++ lmi/trunk/ChangeLog 2012-02-24 12:23:46 UTC (rev 5407)
@@ -29725,9 +29725,15 @@
   workhorse.make
 Copy system-test md5sums to support a version-control system.
 
-20120224T1137Z <address@hidden> [573]
+20120224T1138Z <address@hidden> [573]
 
   wx-2.9.3.patch
 Apply wx changeset 70308. See:
   http://lists.nongnu.org/archive/html/lmi/2012-01/msg00011.html
 
+20120224T1222Z <address@hidden> [573]
+
+  wx-2.9.3.patch
+Apply wx changeset 70318. See:
+  http://lists.nongnu.org/archive/html/lmi/2012-01/msg00012.html
+

Modified: lmi/trunk/wx-2.9.3.patch
===================================================================
--- lmi/trunk/wx-2.9.3.patch    2012-02-24 11:38:08 UTC (rev 5406)
+++ lmi/trunk/wx-2.9.3.patch    2012-02-24 12:23:46 UTC (rev 5407)
@@ -53,4 +53,26 @@
 +
      return true;
  }
+Index: old/wxWidgets-2.9.3/src/generic/datavgen.cpp
+===================================================================
+--- old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70308)
++++ old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70318)
+@@ -3528,4 +3528,5 @@
+     {
+         case WXK_RETURN:
++            if ( !event.HasModifiers() )
+             {
+                 // Enter activates the item, i.e. sends 
wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to
+@@ -3547,4 +3548,5 @@
 
+         case WXK_SPACE:
++            if ( !event.HasModifiers() )
+             {
+                 // Space toggles activatable items or -- if not activatable --
+@@ -3576,4 +3578,5 @@
+
+         case WXK_F2:
++            if ( !event.HasModifiers() )
+             {
+                 if( !m_selection.empty() )
+