[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1027
Date       : Fri May 12 17:09:14 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp
   M /Trunk/XaraLX/wxXtra/combo.cpp

Fix enter handling on owner drawn combos
Fix owner drawn combos so they won't (often) have a vertical scroll bar)


Diff:
Index: Trunk/XaraLX/wxXtra/combo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/combo.cpp	(revision 1026)
+++ Trunk/XaraLX/wxXtra/combo.cpp	(revision 1027)
@@ -716,7 +716,7 @@
                                 // processed by looking at ancestors to see if they have
                                 // wxTAB_TRAVERSAL. The navigation event is then sent to
                                 // the wrong window.
-                                wxTE_PROCESS_TAB |
+                                wxTE_PROCESS_TAB | wxTE_PROCESS_ENTER |
                                 extraStyle,
                                 validator);
 
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1026)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1027)
@@ -502,6 +502,10 @@
 	// Process this one
 	wxPlatformDependent::Get()->InitWindow(pwxWindow);
 
+	// bodge OD combo boxes not to have scroll bars so often
+	if (pwxWindow->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)))
+		((wxOwnerDrawnComboBox*)pwxWindow)->SetPopupMaxHeight(600);
+
 	// Now process children if any
 	wxWindowList::Node * pNode = pwxWindow->GetChildren().GetFirst();
 	while (pNode)


Xara