[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 861
Date       : Sat Apr 22 17:08:28 BST 2006

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

Made RenderDemoDlg work


Diff:
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am	(revision 860)
+++ Trunk/XaraLX/Kernel/Makefile.am	(revision 861)
@@ -61,6 +61,6 @@
 	penedit.cpp aligndlg.cpp exjpeg.cpp aboutdlg.cpp sgdrag.cpp sginit.cpp sgtree.cpp \
 	bmpprefs.cpp expbmp.cpp expcol.cpp prvwflt.cpp bmpexdoc.cpp webop.cpp \
 	zdeflate.cpp jpgdest.cpp webparam.cpp bmpalint.cpp zdftrees.cpp animparams.cpp \
-	sglayer.cpp layermgr.cpp layergal.cpp backgrnd.cpp viewmenu.cpp
+	sglayer.cpp layermgr.cpp layergal.cpp backgrnd.cpp viewmenu.cpp renddlg.cpp
 
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/main3.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main3.cpp	(revision 860)
+++ Trunk/XaraLX/Kernel/main3.cpp	(revision 861)
@@ -188,7 +188,9 @@
 			TraceDlg::Init() &&					// Init the trace dialog
 			WebAddressDlg::Init() &&
 			PhotoCDDlg::Init() &&				// Init the import PhotoCD options dialog
+#endif
 			RenderDemoDlg::Init() &&			// Init the Render Demo Dialog
+#ifndef EXCLUDE_FROM_XARALX
 			AppPrefsDlg::Init() &&				// Init the application preference/options dialog
 			TemplateDialog::Init() &&
 			DocPrefsDlg::Init() &&				// Init the document preference/options dialog
Index: Trunk/XaraLX/Kernel/renddlg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/renddlg.cpp	(revision 860)
+++ Trunk/XaraLX/Kernel/renddlg.cpp	(revision 861)
@@ -206,17 +206,13 @@
 			case DIM_LFT_BN_CLICKED :
 			{
 				// See which button was pressed
-				switch (Msg->GadgetID)
+				if (Msg->GadgetID == _R(IDC_REDRAWBTN))
 				{
-					case _R(IDC_REDRAWBTN) :
-					{
-						// Toggle the colour
-						ShowFirst = ShowFirst ? FALSE : TRUE;
+					// Toggle the colour
+					ShowFirst = ShowFirst ? FALSE : TRUE;
 
-						// invalidate the gadget with the picture in it
-						InvalidateGadget(_R(IDC_REDRAW_ME));
-						break;
-					}
+					// invalidate the gadget with the picture in it
+					InvalidateGadget(_R(IDC_REDRAW_ME));
 				}
 				break;
 			}
@@ -226,27 +222,24 @@
 				// This is where all the redrawing is done
 				// Which control in the window is sending the redraw message (if there are many
 				// grdraw controls you can tell which is which from the Gadget ID
-				switch (Msg->GadgetID)
+				if (Msg->GadgetID == _R(IDC_REDRAW_ME))
 				{
 					// Draw the redraw_me control in here
-					case _R(IDC_REDRAW_ME) :
-					{
-						// Render this control
-						RenderControl((ReDrawInfoType*) Msg->DlgMsgParam);
-						break;
-					}
-
-					// there are no other controls that should get a redraw message ever
-					default :
-					{
-						// give out an error in debug builds, ignore in retail builds
-						ERROR3("Got a redraw message for a control I don't know about");
-						break;
-					}
+					// Render this control
+					RenderControl((ReDrawInfoType*) Msg->DlgMsgParam);
 				}
+				else
+				// there are no other controls that should get a redraw message ever
+				{
+					// give out an error in debug builds, ignore in retail builds
+					ERROR3("Got a redraw message for a control I don't know about");
+					break;
+				}
 
 				break;
 			}
+			default:
+				break;
 		}
 		
 		// Return


Xara