[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1449
Date       : Mon Jul 17 10:39:00 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/oilruler.cpp
   M /Trunk/XaraLX/wxOil/oilruler.h

Inhibit rulers from getting focus, fixing typing in text tool afetr clicking rulers


Diff:
Index: Trunk/XaraLX/wxOil/oilruler.h
===================================================================
--- Trunk/XaraLX/wxOil/oilruler.h	(revision 1448)
+++ Trunk/XaraLX/wxOil/oilruler.h	(revision 1449)
@@ -252,6 +252,7 @@
 	void 	OnRButtonDblClk( wxMouseEvent &event );
 	void 	OnRButtonUp( wxMouseEvent &event );
 
+	void	OnFocus( wxFocusEvent& event );
 
 public:
 	static String_256*	FontName;		// read from .ini file
Index: Trunk/XaraLX/wxOil/oilruler.cpp
===================================================================
--- Trunk/XaraLX/wxOil/oilruler.cpp	(revision 1448)
+++ Trunk/XaraLX/wxOil/oilruler.cpp	(revision 1449)
@@ -168,6 +168,7 @@
 	EVT_RIGHT_UP( 	 	OILRuler::OnRButtonUp)
 	EVT_MOTION(			OILRuler::OnMouseMove)
 	EVT_PAINT(			OILRuler::OnPaint)
+	EVT_SET_FOCUS(		OILRuler::OnFocus)
 END_EVENT_TABLE()
 
 
@@ -1500,7 +1501,7 @@
 }
 
 /********************************************************************************************
->	void OILRuler::SetCurrentStates()
+>	void OILRuler::SetCurrentStates( wxFocusEvent& event )
 
 	Author:		Chris_Parks (Xara Group Ltd) <camelotdev@xxxxxxxx>
 	Created:	15/6/96
@@ -1524,7 +1525,24 @@
 	}
 }
 
+/********************************************************************************************
+>	void OILRuler::OnFocus()
 
+	Author:		Luke_Hart (Xara Group Ltd) <lukeh@xxxxxxxx>
+	Created:	17/07/06
+	Inputs:		-
+	Purpose:	The rulers shouldn't get focues (unless they ever decided to
+				handle arrow movement...)
+	SeeAlso:	
+********************************************************************************************/
+
+void OILRuler::OnFocus( wxFocusEvent& event )
+{
+	// Put the focus back into active view
+	TRACEUSER( "jlh92", _T("NO, that control is not allowed focus") );
+	AfxGetApp().GiveActiveCanvasFocus();
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////////
 // 				OILHorizontalRuler
 /////////////////////////////////////////////////////////////////////////////////////////////


Xara