[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1422
Date       : Fri Jul  7 14:33:19 BST 2006

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

Fix for BZ#1254, keypress was coming from the wxVList and not the wxOwnerDrawnComboBox (which is presumably the parent)


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1421)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1422)
@@ -298,7 +298,8 @@
 		if( pClassInfo->IsKindOf( CLASSINFO(wxTextCtrl) ) ||
 			pClassInfo->IsKindOf( CLASSINFO(wxComboBox) ) ||
 			pClassInfo->IsKindOf( CLASSINFO(wxOwnerDrawnComboBox) ) ||
-			pClassInfo->IsKindOf( CLASSINFO(wxComboCtrl) )
+			pClassInfo->IsKindOf( CLASSINFO(wxComboCtrl) ) ||
+			pClassInfo->IsKindOf( CLASSINFO(wxVListBox) )
 			)
 		{
 			TRACEUSER( "jlh92", _T("Control gets keys") );
@@ -306,6 +307,16 @@
 			return -1;
 		}
 
+#if defined(DEBUG_KEYPRESS_SPEW)
+		while( NULL != pClassInfo )
+		{
+			TRACEUSER( "jlh92", _T("Class %s
"), PCTSTR(pClassInfo->GetClassName()) );
+
+			PCTSTR	pszName = pClassInfo->GetBaseClassName1();
+			pClassInfo = NULL == pszName ? NULL : wxClassInfo::FindClass( pszName );
+		}
+#endif
+
 		// Scan down ancestors looking for either wxPanels (always non-modal) and
 		// wxDailogs (can be modal, so we check)
 		wxWindow *pWnd = (wxWindow*)pEventObject;


Xara