[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1742
Date       : Tue Sep  5 18:25:58 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/prdlgctl.cpp
   M /Trunk/XaraLX/wxOil/prdlgctl.h

Remove spurious internal error on bringing up print dialog


Diff:
Index: Trunk/XaraLX/wxOil/prdlgctl.h
===================================================================
--- Trunk/XaraLX/wxOil/prdlgctl.h	(revision 1741)
+++ Trunk/XaraLX/wxOil/prdlgctl.h	(revision 1742)
@@ -183,7 +183,6 @@
 	String_256		DocTitle;		// The title of the assciated document
 	PrintControl*	pPrCtrl;		// Ptr to print control that will control print layout
 	PrintProgressDlg* pPrgDlg;		// Ptr to the print progress dlg, created by StartPrinting()
-	CCamView*		pCCamView;		// Ptr to the CCamView that is doing the print job
 
 	CCDC * 			pCCDC;			// Ptr to ourx CCDC
 
Index: Trunk/XaraLX/wxOil/prdlgctl.cpp
===================================================================
--- Trunk/XaraLX/wxOil/prdlgctl.cpp	(revision 1741)
+++ Trunk/XaraLX/wxOil/prdlgctl.cpp	(revision 1742)
@@ -1949,6 +1949,8 @@
 
 CCPrintInfo::CCPrintInfo(Document* pDoc,CCamView* pCCamVw)
 {
+	CAM_USE(pCCamVw); // Unused parameter in wxOil - used in WinOil
+
 	pOurPD 		= NULL;
 	pOriginalPD = NULL;
 	Initialised = FALSE;
@@ -1956,7 +1958,6 @@
 	pDocument	= pDoc;
 	pPrCtrl		= NULL;
 	pPrgDlg		= NULL;
-	pCCamView	= pCCamVw;
 	pCCDC 		= NULL;
 	m_bContinuePrinting = TRUE;
 	m_pNativePrintData = NULL;
@@ -1971,7 +1972,7 @@
 
 PORTNOTE("printing", "Disabled creation of a print dialog inside a CCPrintInfo structure")
 #ifndef EXCLUDE_FROM_XARALX
-	if (pDocument != NULL && pCCamView != NULL)
+	if (pDocument != NULL)
 	{
 		pOurPD = new CCPrintDialog(pDocument);
 
@@ -1989,8 +1990,7 @@
 #endif
 
 	ERROR3IF(pDocument == NULL,"CCPrintInfo has NULL document ptr");
-	ERROR3IF(pCCamView == NULL,"CCPrintInfo has NULL CCamView ptr");
-
+	
 	ERROR3IF(CCPrintInfo::pCurrent != NULL,"Constructing a new CCPrintInfo before destructing the old one");
 	CCPrintInfo::pCurrent = this;
 }
@@ -2357,7 +2357,6 @@
 	ERROR2IF(!Initialised,FALSE,"Not initialised");
 	ERROR2IF(pOurPD == NULL,FALSE,"NULL CCPrintDialog ptr");
 	ERROR2IF(pDocument == NULL,FALSE,"Document ptr is NULL");
-	ERROR2IF(pCCamView == NULL,FALSE,"CCamView ptr is NULL");
 
 	// Get ptr to the PrintControl object
 	pPrCtrl = pOurPD->GetPrintControl();


Xara