[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 830
Date       : Mon Apr 17 18:21:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/dialogop.cpp

Fix incorrect default handling of DIM_CANCEL in DialogOp. No functioning
dialog actually calls this.


Diff:
Index: Trunk/XaraLX/Kernel/dialogop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/dialogop.cpp	(revision 829)
+++ Trunk/XaraLX/Kernel/dialogop.cpp	(revision 830)
@@ -2421,13 +2421,17 @@
 				break;
 
 			case DIM_CANCEL:
-			case DIM_CREATE:
+//			case DIM_CREATE:
 			case DIM_BAR_DEATH:
 				// These messages need to be broadcast to all controls within the dialog
 				if (ControlList::Get()->SendMessageToAllControls(this, pDlgMsg))
 				{
-					DlgMgr->Delete(WindowID, this);
-					WindowID = NULL;
+					Close();
+					End();
+					// the Op has now been deleted. Exit fast!
+					return OK;
+					//DlgMgr->Delete(WindowID, this);
+					//WindowID = NULL;
 				}
 				break;
 


Xara