[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1175
Date       : Tue May 23 15:44:47 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/Kernel/impexpop.cpp

Fixes for BZ #1097 & #1098 - Export RGBA pngs and allow export after canceling an export


Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1174)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1175)
@@ -1760,17 +1760,17 @@
 ********************************************************************************************/
 void BmapPrevDlg::HandlePaletteColourDepthListChange()
 {
-	String_16 ColorDepthSelected = GetStringGadgetValue(_R(IDC_COLOUR_DEPTH_COMBO));
+	String_32 ColorDepthSelected = GetStringGadgetValue(_R(IDC_COLOUR_DEPTH_COMBO));
 
 	INT32 newDepth;
 
-	if		(ColorDepthSelected.IsIdentical(String_16(_R(IDS_COLOR_DEPTH_32))))
+	if		(ColorDepthSelected.IsIdentical(String_32(_R(IDS_COLOR_DEPTH_32))))
 		newDepth = 32;
-	else if	(ColorDepthSelected.IsIdentical(String_16(_R(IDS_COLOR_DEPTH_24))))
+	else if	(ColorDepthSelected.IsIdentical(String_32(_R(IDS_COLOR_DEPTH_24))))
 		newDepth = 24;
-	else if	(ColorDepthSelected.IsIdentical(String_16(_R(IDS_COLOR_DEPTH_8))))
+	else if	(ColorDepthSelected.IsIdentical(String_32(_R(IDS_COLOR_DEPTH_8))))
 		newDepth = 8;
-	else if	(ColorDepthSelected.IsIdentical(String_16(_R(IDS_COLOR_DEPTH_4))))
+	else if	(ColorDepthSelected.IsIdentical(String_32(_R(IDS_COLOR_DEPTH_4))))
 	{
 		newDepth = 4;
 
Index: Trunk/XaraLX/Kernel/impexpop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1174)
+++ Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1175)
@@ -1119,6 +1119,7 @@
 			else if (Answer==_R(IDS_CANCEL))
 			{
 				// User has chosen to abort the operation
+				End();
 				return;
 			}
 			else


Xara