[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1162
Date       : Mon May 22 17:57:41 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camresource.cpp
   M /Trunk/XaraLX/wxOil/errors.cpp

Fix tabs


Diff:
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp	(revision 1161)
+++ Trunk/XaraLX/wxOil/camresource.cpp	(revision 1162)
@@ -1768,11 +1768,11 @@
 	if (!pSplashBitmap->Ok()) return FALSE;
 
 	pSplashScreen = new wxAdvSplashScreen(*pSplashBitmap,
-          wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT,
-          0, NULL, -1, wxDefaultPosition, wxDefaultSize,
-          wxNO_BORDER
+		wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT,
+		0, NULL, -1, wxDefaultPosition, wxDefaultSize,
+		wxNO_BORDER
 #if !defined (_DEBUG)
-		  |wxSTAY_ON_TOP // Only stay on top in non-debug builds - too annoying for preinit debugging
+		|wxSTAY_ON_TOP // Only stay on top in non-debug builds - too annoying for preinit debugging
 #endif
 		  );
 	if (!pSplashScreen) return FALSE;
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1161)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1162)
@@ -560,11 +560,11 @@
 	CamResource::DoneInit();
 
 	pMessage->Wrap(400);
-    //pMessage->Enable(false); // this annoyingly does not grey it
+	//pMessage->Enable(false); // this annoyingly does not grey it
 	//pMessage->SetBackgroundColour(pBox->GetBackgroundColour());
-    pMessageSizer->Add(pMessage, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxFIXED_MINSIZE, 5);
+	pMessageSizer->Add(pMessage, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxFIXED_MINSIZE, 5);
 
-    wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+	wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	if (!pButtonSizer)
 	{
 		Beep();
@@ -572,7 +572,7 @@
 		delete pBox;
 		return OK;
 	}
-    pVSizer->Add(pButtonSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+	pVSizer->Add(pButtonSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
 #define EB_MAXBUTS 7
 	wxButton * pButt[EB_MAXBUTS]; // see help below, note we don't use zero, 5 is reserved for help
@@ -598,7 +598,7 @@
 		if (butres[butt])
 		{
 			pButt[butt] = ((CamErrorDialog *)pBox)->AddErrorButton(pButtonSizer, CamResource::GetText(butres[butt]),
-																 butres[butt]);
+																butres[butt]);
 			if (!pButt[butt])
 			{
 				Beep();
@@ -618,12 +618,12 @@
 		pBox->SetDefaultItem(pButt[OK]);
 	}
 
-    pBox->GetSizer()->Fit(pBox);
-    pBox->GetSizer()->SetSizeHints(pBox);
-    pBox->Centre();
+	pBox->GetSizer()->Fit(pBox);
+	pBox->GetSizer()->SetSizeHints(pBox);
+	pBox->Centre();
 
- 	// Disable the system's functionality for serious errors (i.e. stop rendering etc).
- 	if (Error == ERRORTYPE_SERIOUS || Error == ERRORTYPE_ENSURE) CCamApp::DisableSystem();
+	// Disable the system's functionality for serious errors (i.e. stop rendering etc).
+	if (Error == ERRORTYPE_SERIOUS || Error == ERRORTYPE_ENSURE) CCamApp::DisableSystem();
 	if ( Error::IsInRenderThread() )
 		TRACE( _T("InformGeneral called within RenderThread => serious rendering error"));
 


Xara