[lmi-commits] [5406] Apply wx changeset 70308

[Greg Chicares]

Revision: 5406
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5406
Author:   chicares
Date:     2012-02-24 11:38:08 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
Apply wx changeset 70308

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-02-20 12:22:47 UTC (rev 5405)
+++ lmi/trunk/ChangeLog 2012-02-24 11:38:08 UTC (rev 5406)
@@ -29720,3 +29720,14 @@
   xml_lmi.hpp
 Expunge a function disused since 20120220T0158Z.
 
+20120220T1222Z <address@hidden> [573]
+
+  workhorse.make
+Copy system-test md5sums to support a version-control system.
+
+20120224T1137Z <address@hidden> [573]
+
+  wx-2.9.3.patch
+Apply wx changeset 70308. See:
+  http://lists.nongnu.org/archive/html/lmi/2012-01/msg00011.html
+

Modified: lmi/trunk/wx-2.9.3.patch
===================================================================
--- lmi/trunk/wx-2.9.3.patch    2012-02-20 12:22:47 UTC (rev 5405)
+++ lmi/trunk/wx-2.9.3.patch    2012-02-24 11:38:08 UTC (rev 5406)
@@ -21,4 +21,36 @@
 -        wxCriticalSectionLocker lock(gs_perfCounter.cs);
 +        wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs);
          ::QueryPerformanceFrequency(&gs_perfCounter.freq);
+
+Index: old/wxWidgets-2.9.3/src/generic/datavgen.cpp
+===================================================================
+--- old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70201)
++++ old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70308)
+@@ -623,4 +623,7 @@
+     void ChangeCurrentRow( unsigned int row );
+     bool TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward);
++
++    wxDataViewColumn *GetCurrentColumn() const { return m_currentCol; }
++    void ClearCurrentColumn() { m_currentCol = NULL; }
  
+     bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }
+@@ -4743,4 +4746,8 @@
+     m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
+     m_cols.Erase(ret);
++
++    if ( m_clientArea->GetCurrentColumn() == column )
++        m_clientArea->ClearCurrentColumn();
++
+     OnColumnsCountChanged();
+ 
+@@ -4753,5 +4760,9 @@
+     m_cols.Clear();
+     m_colsBestWidths.clear();
++
++    m_clientArea->ClearCurrentColumn();
++
+     OnColumnsCountChanged();
++
+     return true;
+ }
+