[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1487
Date       : Thu Jul 20 15:07:12 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmpexprw.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc

Some small tweaks to get the buttons on preview to work


Diff:
Index: Trunk/XaraLX/Kernel/bmpexprw.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1486)
+++ Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1487)
@@ -1342,17 +1342,15 @@
 
 void BitmapExportPreviewDialog::OnZoomTool()
 {
-	BOOL Valid = FALSE;
-	BOOL State = GetLongGadgetValue(_R(IDC_ZOOM_TOOL), 0, 1, 0, &Valid);
-	if (!State)
-	{
-		SetLongGadgetValue(_R(IDC_ZOOM_TOOL), TRUE);
-		SetLongGadgetValue(_R(IDC_PUSH_TOOL), FALSE);
-		m_CurrentTool = PREVIEW_ZOOM_TOOL;
+	//  When the Zoom is clicked, make sure that the Color Selector and Push
+	//  tools are deselected.
+	SetLongGadgetValue( _R(IDC_COLOUR_SELECTOR), FALSE );
+	SetLongGadgetValue( _R(IDC_PUSH_TOOL), FALSE );
+	//  Select the Push tool
+	SetLongGadgetValue( _R(IDC_ZOOM_TOOL), TRUE );
 
-		//  Turn the colour selector tool off.
-		SetLongGadgetValue( _R(IDC_COLOUR_SELECTOR), FALSE );
-	}
+	//  Set this as the current tool
+	m_CurrentTool = PREVIEW_ZOOM_TOOL;
 }
 
 /******************************************************************************************
@@ -1401,17 +1399,15 @@
 
 void BitmapExportPreviewDialog::OnPushTool()
 {
-	BOOL Valid = FALSE;
-	BOOL State = GetLongGadgetValue(_R(IDC_PUSH_TOOL), 0, 1, 0, &Valid);
-	if (!State)
-	{
-		SetLongGadgetValue(_R(IDC_PUSH_TOOL), TRUE);
-		SetLongGadgetValue(_R(IDC_ZOOM_TOOL), FALSE);
-		m_CurrentTool = PREVIEW_PUSH_TOOL;
+	//  When the Push is clicked, make sure that the Color Selector and Zoom 
+	//  tools are deselected.
+	SetLongGadgetValue( _R(IDC_COLOUR_SELECTOR), FALSE );
+	SetLongGadgetValue( _R(IDC_ZOOM_TOOL), FALSE );
+	//  Select the Push tool
+	SetLongGadgetValue( _R(IDC_PUSH_TOOL), TRUE );
 
-		//  Turn the Colour Selector off
-		SetLongGadgetValue( _R(IDC_COLOUR_SELECTOR), FALSE );
-	}
+	//  Set this as the current tool
+	m_CurrentTool = PREVIEW_PUSH_TOOL;
 }
 
 
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc	(revision 1486)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc	(revision 1487)
@@ -49,27 +49,33 @@
 			<style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
 		</object>
 		<object class="wxCamArtControl" name="IDC_ZOOM_TOOL">
-			 <pos>183,6d</pos> <size>20,20d</size>
+			<pos>183,6d</pos> <size>20,20d</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
 			<label>-</label>
 		</object>
 		<object class="wxCamArtControl" name="IDC_PUSH_TOOL">
-			 <pos>183,32d</pos> <size>20,20d</size>
+			<pos>183,32d</pos> <size>20,20d</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
 			<label>-</label>
 		</object>
 		<object class="wxCamArtControl" name="IDC_ZOOM_TO_FIT">
 			 <pos>183,56d</pos> <size>20,20d</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
 			<label>-</label>
 		</object>
 		<object class="wxCamArtControl" name="IDC_100PERCENT">
 			 <pos>183,80d</pos> <size>20,20d</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
 			<label>-</label>
 		</object>
 		<object class="wxCamArtControl" name="IDC_1TO1">
 			 <pos>183,104d</pos> <size>20,20d</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
 			<label>-</label>
 		</object>
 		<object class="wxCamArtControl" name="IDC_COLOUR_SELECTOR">
 			 <pos>183,128d</pos> <size>20,20d</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
 			<label>-</label>
 		</object>
 		<title></title>


Xara