[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1783
Date       : Sun Oct 21 22:58:59 BST 2007

Changed paths:
   M /Trunk/XaraLX/wxOil/errors.cpp

Reversing previous patch; the problem is a wider incompatibility between GTK
2.12 and wxWidgets 2.6.x, as described in Bug #3259. Essentially button
border allocation is now done using GSlice, but 2.6.x is blindly gfree()ing
them.

Suggest moving to wxWidgets 2.8.x


Diff:
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1782)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1783)
@@ -656,9 +656,7 @@
 	// Set the default
 	if ( ((UINT32)OK <EB_MAXBUTS) && butres[OK] && pButt[OK])
 	{
-//		The following should be unnecessary but harmless. It appears to cause a crash on
-//		newer GTK under wxWidgets 2.6.xx for an "ImageMagick not installed" error box
-//		pButt[OK]->SetDefault();
+		pButt[OK]->SetDefault();
 		pBox->SetDefaultItem(pButt[OK]);
 	}
 


Xara