lmi
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi] fix compilation with wx-2.8 compatibility disabled


From: Václav Slavík
Subject: [lmi] fix compilation with wx-2.8 compatibility disabled
Date: Mon, 3 Feb 2014 16:06:03 +0100

Hi,

the patch below fixes LMI compilation against wxWidgets with 
WXWIN_COMPATIBILITY_2_8 disabled (as is the default in wx3). It still works 
with 2.9.5, of course.

Regards,
Vaclav


diff --git a/docmanager_ex.hpp b/docmanager_ex.hpp
index a50e112..46aa0e7 100644
--- a/docmanager_ex.hpp
+++ b/docmanager_ex.hpp
@@ -42,7 +42,7 @@ class DocManagerEx
 {
   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
diff --git a/multidimgrid_any.cpp b/multidimgrid_any.cpp
index 25413be..95ebfb7 100644
--- a/multidimgrid_any.cpp
+++ b/multidimgrid_any.cpp
@@ -157,7 +157,7 @@ wxSize MultiDimGridGrid::DoGetBestSize() const
     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:




reply via email to

[Prev in Thread] Current Thread [Next in Thread]