[lmi-commits] [5858] Prepare for wx-3.0 (VS)

[Greg Chicares]

Revision: 5858
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5858
Author:   chicares
Date:     2014-02-23 00:43:44 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Prepare for wx-3.0 (VS)

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/docmanager_ex.hpp
    lmi/trunk/multidimgrid_any.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-02-22 23:32:22 UTC (rev 5857)
+++ lmi/trunk/ChangeLog 2014-02-23 00:43:44 UTC (rev 5858)
@@ -33578,3 +33578,10 @@
   version.hpp
 Designate release candidate 5857.
 
+20140223T0043Z <address@hidden> [542]
+
+  docmanager_ex.hpp
+  multidimgrid_any.cpp
+Prepare for wx-3.0 (VS). See:
+  http://lists.nongnu.org/archive/html/lmi/2014-02/msg00000.html
+

Modified: lmi/trunk/docmanager_ex.hpp
===================================================================
--- lmi/trunk/docmanager_ex.hpp 2014-02-22 23:32:22 UTC (rev 5857)
+++ lmi/trunk/docmanager_ex.hpp 2014-02-23 00:43:44 UTC (rev 5858)
@@ -42,7 +42,7 @@
 {
   public:
     explicit DocManagerEx
-        (long int flags  = wxDEFAULT_DOCMAN_FLAGS
+        (long int flags  = 0
         ,bool initialize = true
         );
     // WX !! Base class wxDocManager's dtor is virtual, but isn't

Modified: lmi/trunk/multidimgrid_any.cpp
===================================================================
--- lmi/trunk/multidimgrid_any.cpp      2014-02-22 23:32:22 UTC (rev 5857)
+++ lmi/trunk/multidimgrid_any.cpp      2014-02-23 00:43:44 UTC (rev 5858)
@@ -157,7 +157,7 @@
     MultiDimGridGrid * const self = const_cast<MultiDimGridGrid *>(this);
 
     // 100 is the default minimal size of a widget - taken from wx headers.
-    int width  = std::max(self->GetRowLabelSize() + self->GetColumnWidth(0), 
100);
+    int width  = std::max(self->GetRowLabelSize() + self->GetColSize(0), 100);
     int height = std::max(self->GetColLabelSize() + self->GetRowHeight(0), 
100);
 
     // The following is from the wx header file for wxScrollWindow: