[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1051
Date       : Mon May 15 13:38:12 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/Makefile.am
   M /Trunk/XaraLX/Kernel/colormgr.cpp
   M /Trunk/XaraLX/Kernel/newcol.cpp
   M /Trunk/XaraLX/Kernel/sginit.cpp

Fixed new colour dialog


Diff:
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am	(revision 1050)
+++ Trunk/XaraLX/Kernel/Makefile.am	(revision 1051)
@@ -67,6 +67,6 @@
 	optsedit.cpp optsmisc.cpp optspntr.cpp optstune.cpp optsview.cpp optsgrid.cpp \
 	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
+	aprps.cpp prevwdlg.cpp frameops.cpp newcol.cpp
 
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/sginit.cpp
===================================================================
--- Trunk/XaraLX/Kernel/sginit.cpp	(revision 1050)
+++ Trunk/XaraLX/Kernel/sginit.cpp	(revision 1051)
@@ -102,7 +102,7 @@
 
 #include "app.h"		// For GetApplication()
 #include "layergal.h"	// For OpDisplayLayerGallery et al
-//#include "newcol.h"		// For NewColourDlg
+#include "newcol.h"		// For NewColourDlg
 #include "sgallery.h"	// For SGalleryOptionsDlg and SGallerySearchDlg
 #include "sgbitmap.h"	// For OpDisplayBitmapGallery
 #include "sgcolour.h"	// For OpDisplayColourGallery && ColourSGallery::Init
@@ -192,9 +192,7 @@
 				ColourSGallery::Init()				&&
 				OpDisplayColourGallery::Init()		&&
 				ColourNameDlg::Init()				&&
-#ifndef EXCLUDE_FROM_XARALX
 				NewColourDlg::Init()				&&
-#endif
 				OpDisplayBitmapGallery::Init()		&&
 #ifndef EXCLUDE_FROM_XARALX
 				OpDisplayFontsGallery::Init()		&&
Index: Trunk/XaraLX/Kernel/newcol.cpp
===================================================================
--- Trunk/XaraLX/Kernel/newcol.cpp	(revision 1050)
+++ Trunk/XaraLX/Kernel/newcol.cpp	(revision 1051)
@@ -101,7 +101,7 @@
 
 #include "coldrop.h"
 #include "collist.h"
-#include "colpick.h"
+//#include "colpick.h"
 #include "colourix.h"
 //#include "jason.h"
 #include "keypress.h"
Index: Trunk/XaraLX/Kernel/colormgr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/colormgr.cpp	(revision 1050)
+++ Trunk/XaraLX/Kernel/colormgr.cpp	(revision 1051)
@@ -1561,7 +1561,7 @@
 		NewName.MakeMsg(_R(IDS_NEWCOLOUR));			// No name, so make it named: "New colour"
 */
 
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 #ifndef STANDALONE
 	// Ask for a new name for the colour. This also gives the user a chance
 	// to back out of the deal without losing their deposit (though if they didn't


Xara