[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1026
Date       : Fri May 12 16:27:33 BST 2006

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

Treat focus in OwnerDrawnComboBox etc. as per ComboBox


Diff:
Index: Trunk/XaraLX/wxOil/dlgevt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.cpp	(revision 1025)
+++ Trunk/XaraLX/wxOil/dlgevt.cpp	(revision 1026)
@@ -508,7 +508,9 @@
 	// as more controls come online). If so just return allowing focus to stay
 	wxWindow*	pWnd = (wxWindow*)event.GetEventObject();
 	if( pWnd->IsKindOf( CLASSINFO(wxTextCtrl) ) ||
-		pWnd->IsKindOf( CLASSINFO(wxComboBox) ) )
+		pWnd->IsKindOf( CLASSINFO(wxComboBox) ) ||
+		pWnd->IsKindOf( CLASSINFO(wxOwnerDrawnComboBox) ) ||
+		pWnd->IsKindOf( CLASSINFO(wxComboControl) ) )
 	{
 		return;
 	}
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1025)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1026)
@@ -261,7 +261,10 @@
 		// Is the object allowed to recieve keys? 
 		wxClassInfo* pClassInfo = pEventObject->GetClassInfo();
 		if( pClassInfo->IsKindOf( CLASSINFO(wxTextCtrl) ) ||
-			pClassInfo->IsKindOf( CLASSINFO(wxComboBox) ) )
+			pClassInfo->IsKindOf( CLASSINFO(wxComboBox) ) ||
+			pClassInfo->IsKindOf( CLASSINFO(wxOwnerDrawnComboBox) ) ||
+			pClassInfo->IsKindOf( CLASSINFO(wxComboControl) )
+			)
 		{
 			TRACEUSER( "jlh92", _T("Control gets keys") );
 			// Yes, pass on as usual


Xara