[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

[XaraXtreme-dev] Focus patch (was Re: [XaraXtreme-commits] Commit Complete)



Luke,

Would it be easier to make this list inclusive rather than exclusive?

IE

if (NULL != pFocusWnd &&
   (pFocusWnd->IsKindOf(wxTextControl)
    || pFocusWnd->IsKindOf(wxComboBox)
    ...
   )
etc.

there are lots of others missing from the list, like radio buttons etc.,
and it seems it would be easier to list the controls that we DO want to
take the keys.

Alex

--On 03 May 2006 09:26 +0100 subversion@xxxxxxxxxxxxxx wrote:

Commit by  : luke
Repository : xara
Revision   : 943
Date       : Wed May  3 09:26:24 BST 2006

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

Fix for failure to get Fn keys whilst 'focus' is on layers gallery


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 942)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 943)
@@ -212,12 +212,13 @@
 	// Whilst debugging focus can end-up NULL, so we protect ourselves
 	wxWindow*			pFocusWnd = wxWindow::FindFocus();
 	wxClassInfo*		pClassInfo = NULL != pFocusWnd ?
pFocusWnd->GetClassInfo() : NULL; -	TRACEUSER( "luke", _T("Focus = %s
"), pClassInfo?pClassInfo->GetClassName():_T("None") );
+	TRACEUSER( "jlh92", _T("Focus = %s
"), pClassInfo?pClassInfo->GetClassName():_T("None") );
 	if(  NULL != pFocusWnd &&
 		 pClassInfo->IsKindOf( CLASSINFO(wxControl) ) &&
 		!pClassInfo->IsKindOf( CLASSINFO(wxButton) ) &&
 		!pClassInfo->IsKindOf( CLASSINFO(wxSlider) ) &&
-		!pClassInfo->IsKindOf( CLASSINFO(wxCamArtControl) ) )
+		!pClassInfo->IsKindOf( CLASSINFO(wxCamArtControl) ) &&
+		!pClassInfo->IsKindOf( CLASSINFO(wxCamDrawControl) ) )
 	{
 		event.Skip();
 		return;


Xara





Alex