[lmi-commits] [6084] Refocus parent when editing stops (VZ)

[Greg Chicares]

Revision: 6084
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6084
Author:   chicares
Date:     2015-01-09 22:13:29 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Refocus parent when editing stops (VZ)

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/input_sequence_entry.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-01-09 15:46:40 UTC (rev 6083)
+++ lmi/trunk/ChangeLog 2015-01-09 22:13:29 UTC (rev 6084)
@@ -35490,3 +35490,19 @@
   zero_test.cpp
 Update copyright notices.
 
+20150109T1545Z <address@hidden> [516]
+
+  INSTALL
+Specify a more recent java version that supports 'jing'.
+
+20150109T1546Z <address@hidden> [516]
+
+  objects.make
+Fix defect introduced 20141215T1454Z: some unit tests didn't link.
+
+20150109T2213Z <address@hidden> [516]
+
+  input_sequence_entry.cpp
+Refocus parent when editing stops (VZ). With recent wx changes, this
+had stopped working implicitly inside the census manager.
+

Modified: lmi/trunk/input_sequence_entry.cpp
===================================================================
--- lmi/trunk/input_sequence_entry.cpp  2015-01-09 15:46:40 UTC (rev 6083)
+++ lmi/trunk/input_sequence_entry.cpp  2015-01-09 22:13:29 UTC (rev 6084)
@@ -1407,6 +1407,13 @@
     editor.CentreOnParent();
 
     editor.ShowModal();
+
+    // If this editor is used inside wxDataViewCtrl, don't keep focus after
+    // showing the dialog but give it to the parent to ensure that the editor
+    // is closed by it. Notice that there is no need to check if we actually
+    // are inside wxDataViewCtrl before doing it as otherwise our parent (e.g.
+    // a wxPanel) will just give focus back to us and nothing really happens.
+    GetParent()->SetFocus();
 }
 
 IMPLEMENT_DYNAMIC_CLASS(InputSequenceEntryXmlHandler, wxXmlResourceHandler)