[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5859] Refine wx-3.0 preparation
From: |
Greg Chicares |
Subject: |
[lmi-commits] [5859] Refine wx-3.0 preparation |
Date: |
Mon, 24 Feb 2014 02:02:46 +0000 |
Revision: 5859
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5859
Author: chicares
Date: 2014-02-24 02:02:45 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Refine wx-3.0 preparation
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/multidimgrid_any.cpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-02-23 00:43:44 UTC (rev 5858)
+++ lmi/trunk/ChangeLog 2014-02-24 02:02:45 UTC (rev 5859)
@@ -33585,3 +33585,9 @@
Prepare for wx-3.0 (VS). See:
http://lists.nongnu.org/archive/html/lmi/2014-02/msg00000.html
+20140224T0202Z <address@hidden> [542]
+
+ multidimgrid_any.cpp
+Refine wx-3.0 preparation. See:
+ http://lists.nongnu.org/archive/html/lmi/2014-02/msg00009.html
+
Modified: lmi/trunk/multidimgrid_any.cpp
===================================================================
--- lmi/trunk/multidimgrid_any.cpp 2014-02-23 00:43:44 UTC (rev 5858)
+++ lmi/trunk/multidimgrid_any.cpp 2014-02-24 02:02:45 UTC (rev 5859)
@@ -152,13 +152,9 @@
wxSize MultiDimGridGrid::DoGetBestSize() const
{
- // unfortunately GetCol/RowLabelSize() and GetColumnWidth()/GetRowHeight()
- // are not const in wx up to 2.8 so we need the const_cast here
- 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->GetColSize(0), 100);
- int height = std::max(self->GetColLabelSize() + self->GetRowHeight(0),
100);
+ int width = std::max(GetRowLabelSize() + GetColSize(0), 100);
+ int height = std::max(GetColLabelSize() + GetRowSize(0), 100);
// The following is from the wx header file for wxScrollWindow:
// Round up to a multiple the scroll rate NOTE: this still doesn't get rid
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5859] Refine wx-3.0 preparation,
Greg Chicares <=