[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1119
Date       : Thu May 18 17:24:06 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/Makefile.am
   M /Trunk/XaraLX/Kernel/exceptio.cpp

Fix compilation of exception generating code - not yet linked in


Diff:
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am	(revision 1118)
+++ Trunk/XaraLX/Kernel/Makefile.am	(revision 1119)
@@ -68,6 +68,6 @@
 	optspage.cpp optsundo.cpp optsscal.cpp optsunit.cpp pagesize.cpp radio.cpp \
 	xpfcaps.cpp xpfilter.cpp xpfrgn.cpp layerprp.cpp prpsgds.cpp prpslyrs.cpp \
 	aprps.cpp prevwdlg.cpp frameops.cpp newcol.cpp tracedlg.cpp tracectl.cpp \
-	tracergn.cpp bfxbase.cpp
+	tracergn.cpp bfxbase.cpp exceptio.cpp
 
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/exceptio.cpp
===================================================================
--- Trunk/XaraLX/Kernel/exceptio.cpp	(revision 1118)
+++ Trunk/XaraLX/Kernel/exceptio.cpp	(revision 1119)
@@ -149,14 +149,14 @@
 		if (pDocView != NULL)
 		{
 			pDocView->ForceRedraw();										// posts the paint message
-			CWnd *pWnd = DocView::GetCurrentRenderWindow();
+			CWindowID pWnd = DocView::GetCurrentRenderWindow();
 			if (pWnd)
 			{
 				// Set trap for later
 				RenderTrap = TRUE;										
 				// Now do the paint
 				TRACE( _T("Into update explosion
"));
-				pWnd->UpdateWindow();										// do the paint
+				pWnd->Update();										// do the paint
 				TRACE( _T("Out of update explosion
"));
 			}
 		}


Xara