[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1716
Date       : Thu Aug 24 16:33:50 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camelot.cpp

Fix cursor issue when tabbing between windows (BZ #1415)


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1715)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1716)
@@ -304,14 +304,14 @@
 
 	if ( event.GetEventType() == wxEVT_KILL_FOCUS )
 	{
+#if defined(_DEBUG)
 		wxFocusEvent&	FocusEvent = (wxFocusEvent&)event;
-		TRACEUSER( "jlh92", _T("CCamApp::FilterEvent kill focus to %016x from 0x%016x"), FocusEvent.GetWindow(), 
+		TRACEUSER( "luke", _T("CCamApp::FilterEvent kill focus to %016x from 0x%016x"), FocusEvent.GetWindow(), 
 				FocusEvent.GetEventObject() );
+#endif
 
-		// When we're given a null focus window it means the whole app
-		// is losing focus, so we need to result the cursor shape.
-		if( NULL == FocusEvent.GetWindow() )
-			CursorStack::GSetActive();
+		// Any loss of focus could well a good time to kill cursor
+		wxSetCursor( *wxSTANDARD_CURSOR );
 	}
 
 	if (( event.GetEventType() == wxEVT_CREATE )


Xara