[XaraXtreme-dev] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 711
Date       : Wed Mar 22 16:46:09 GMT 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/dialogop.cpp
   M /Trunk/XaraLX/Scripts/rc2xml.pl

Final dialogdraw rendering fix I hope


Diff:
Index: Trunk/XaraLX/Kernel/dialogop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/dialogop.cpp	(revision 710)
+++ Trunk/XaraLX/Kernel/dialogop.cpp	(revision 711)
@@ -129,8 +129,9 @@
 //#include "colcontx.h"
 
 #include "ccdc.h"			// For redraw with RenderRegions
-//#include "grnddib.h"
-//#include "osrndrgn.h"
+#include "grndrgn.h"
+#include "grnddib.h"
+#include "osrndrgn.h"
 #include "dlgview.h"
 #include "docmsgs.h"
 #include "docvmsg.h"
@@ -2538,8 +2539,6 @@
 RenderRegion* DialogOp::CreateGRenderRegion(DocRect* pRequiredSize, ReDrawInfoType* ExtraInfo,
 												BOOL UseSelViewColContext)
 {
-	PORTNOTETRACE("dialog","DialogOp::CreateGRenderRegion - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	// Make a new dialog view
 	DialogView *pDialogView = new DialogView;
 	if (pDialogView == NULL)
@@ -2609,7 +2608,6 @@
 
 	// Something went wrong, fail
 	delete pDialogView;
-#endif
 	return NULL;
 }
 
@@ -2632,8 +2630,6 @@
 
 BOOL DialogOp::DestroyGRenderRegion(RenderRegion* pRender)
 {
-	PORTNOTETRACE("dialog","DialogOp::DestroyGRenderRegion - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	// Test for preconditions
 	ERROR2IF(pRender==NULL, FALSE, "DestroyGRenderRegion was passed a NULL render region");
 
@@ -2646,7 +2642,7 @@
 	View* pView = pRender->GetRenderView();
 	delete pRender;
 	delete pView;
-#endif
+
 	// It worked
 	return TRUE;
 }
@@ -2689,8 +2685,6 @@
 RenderRegion* DialogOp::CreateOSRenderRegion(DocRect* pRequiredSize, ReDrawInfoType* ExtraInfo,
 												BOOL UseSelViewColContext)
 {
-	PORTNOTETRACE("dialog","DialogOp::CreateOSRenderRegion - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	// Make a new dialog view
 	DialogView *pDialogView = new DialogView;
 	if (pDialogView == NULL)
@@ -2763,7 +2757,6 @@
 
 	// Something went wrong, fail
 	delete pDialogView;
-#endif
 	return NULL;
 }
 
@@ -2772,7 +2765,7 @@
 
 /********************************************************************************************
 
->	BOOL DialogOp::DestroyGRenderRegion()
+>	BOOL DialogOp::DestroyOSRenderRegion(RenderRegion* pRender)
 
 	Author:		Rik_Heywood (Xara Group Ltd) <camelotdev@xxxxxxxx> (Jason copied CreateGRenderRegion)
 	Created:	17/10/94 (11/1/95)
@@ -2791,8 +2784,6 @@
 
 BOOL DialogOp::DestroyOSRenderRegion(RenderRegion* pRender)
 {
-	PORTNOTETRACE("dialog","DialogOp::DestroyOSRenderRegion - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	// Test for preconditions
 	ERROR2IF(pRender==NULL, FALSE, "DestroyOSRenderRegion was passed a NULL render region");
 
@@ -2805,7 +2796,7 @@
 	View* pView = pRender->GetRenderView();
 	delete pRender;
 	delete pView;
-#endif
+
 	// It worked
 	return TRUE;
 }
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl	(revision 710)
+++ Trunk/XaraLX/Scripts/rc2xml.pl	(revision 711)
@@ -638,7 +638,7 @@
     my @rect;
     ReadRect (\@rect);
 
-    print OUTPUT "		<object class=\"wxStaticBitmap\"";
+    print OUTPUT "		<object class=\"wxCamDrawControl\"";
     WriteBasicInfo (@rect, $varname);
     # <Bitmap></Bitmap> deliberately omitted
     print OUTPUT "		</object>
";


Xara