[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1416
Date       : Thu Jul  6 18:50:07 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/bitmapdropdown.cpp
   M /Trunk/XaraLX/wxXtra/odcombo.h

Remove a wrinkle in compiling with wxWidgets 2.7 now I have committed a suitable fix to 2.7


Diff:
Index: Trunk/XaraLX/wxXtra/odcombo.h
===================================================================
--- Trunk/XaraLX/wxXtra/odcombo.h	(revision 1415)
+++ Trunk/XaraLX/wxXtra/odcombo.h	(revision 1416)
@@ -125,6 +125,8 @@
     wxCoord GetTotalHeight() const { return EstimateTotalHeight(); }
     wxCoord GetLineHeight(int line) const { return OnGetLineHeight(line); }
 
+	int GetWidestItemWidth() { return m_widestWidth; }
+
 protected:
 
     // Called by OnComboDoubleClick and OnComboKeyEvent
Index: Trunk/XaraLX/wxOil/bitmapdropdown.cpp
===================================================================
--- Trunk/XaraLX/wxOil/bitmapdropdown.cpp	(revision 1415)
+++ Trunk/XaraLX/wxOil/bitmapdropdown.cpp	(revision 1416)
@@ -256,13 +256,7 @@
         height = 50;
 
     // Take scrollbar into account in width calculations
-#if wxCHECK_VERSION(2,7,0)
-	// Oh dear, someone made the member private
-PORTNOTE("wx", "m_widestWidth not able to be read")
-	int iWidth = 50;
-#else
-    int iWidth = m_widestWidth;
-#endif
+    int iWidth = GetWidestItemWidth();
 	if (bNeedScrollbar)
     	iWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 //	int widestWidth = m_widestWidth + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);


Xara