[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1522
Date       : Tue Jul 25 12:40:55 BST 2006

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

Enable cursors over preview areas and fix buttons after dialogblocks boke them again


Diff:
Index: Trunk/XaraLX/Kernel/bmpexprw.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1521)
+++ Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1522)
@@ -454,7 +454,7 @@
 		((id == _R(IDC_REDRAW2)) && (m_ActiveBitmap != 2)))
 	{
 		// over the unselected control
-		pCursor = new Cursor(_R(IDC_ARROW));
+		pCursor = new Cursor( wxCURSOR_ARROW );
 	}
 	else
 	{
@@ -462,21 +462,21 @@
 		if (m_CurrentTool == PREVIEW_ZOOM_TOOL)
 		{
 			if (AdjustState)
-				pCursor = new Cursor(_R(IDC_ZOOMOUT));
+				pCursor = new Cursor( (Tool_v1*)NULL, _R(IDC_ZOOMOUT));
 			else
-				pCursor = new Cursor(_R(IDC_ZOOMIN));
+				pCursor = new Cursor( (Tool_v1*)NULL, _R(IDC_ZOOMIN));
 		}
 		else if (m_CurrentTool == PREVIEW_PUSH_TOOL)
 		{
-			pCursor = new Cursor(_R(IDC_PICKHAND));
+			pCursor = new Cursor( (Tool_v1*)NULL, _R(IDC_PICKHAND));
 		}									
 		else if( m_CurrentTool == PREVIEW_COLOUR_SELECTOR_TOOL )
 		{
 			//  Set the cursor for the colour selector. 
-			pCursor = new Cursor( _R(IDC_COLOURSELECTOR) );
+			pCursor = new Cursor( (Tool_v1*)NULL, _R(IDC_COLOURSELECTOR) );
 		}
 		else
-			pCursor = new Cursor( _R(IDC_COLOURSELECTOR) );
+			pCursor = new Cursor( (Tool_v1*)NULL, _R(IDC_COLOURSELECTOR) );
 	}
 	
 	// push (and display) the cursor
@@ -964,10 +964,9 @@
 						
 						//capture the mouse pointer
 						CaptureMouse(Msg->GadgetID);
-						
+#endif
 						// the mouse is moved inside the control, so update the cursor
 						SetCurrentCursor(Msg->GadgetID);
-#endif
 						
 						//	If we are doing image slicing, then return now
 						if( BmapPrevDlg::m_bSlicingImage )
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc	(revision 1521)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc	(revision 1522)
@@ -87,28 +87,34 @@
             <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
         </object>
         <object class="wxCamArtControl" name="IDC_ZOOM_TOOL">
-            <size>35,42</size>
+			<size>35,42</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
             <pos>320,12</pos>
         </object>
         <object class="wxCamArtControl" name="IDC_PUSH_TOOL">
             <size>35,42</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
             <pos>320,68</pos>
         </object>
         <object class="wxCamArtControl" name="IDC_ZOOM_TO_FIT">
             <size>35,42</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
             <pos>320,119</pos>
         </object>
         <object class="wxCamArtControl" name="IDC_100PERCENT">
             <size>35,42</size>
+			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
             <pos>320,170</pos>
         </object>
         <object class="wxCamArtControl" name="IDC_1TO1">
             <size>35,42</size>
-            <pos>320,221</pos>
+ 			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+           <pos>320,221</pos>
         </object>
         <object class="wxCamArtControl" name="IDC_COLOUR_SELECTOR">
             <size>35,42</size>
-            <pos>320,272</pos>
+ 			<camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
+           <pos>320,272</pos>
         </object>
     </object>
 </resource>


Xara