[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1066
Date       : Tue May 16 09:51:07 BST 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/barconverter
   M /Trunk/XaraLX/wxOil/dropdown.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc

Fix to text drop-down control


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 1065)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 1066)
@@ -145,7 +145,8 @@
 		    "IDC_FREEHANDSLIDER" => 128,
 		    "IDC_SOFTSHADOWSLIDER" => 128,
 		    "IDC_SOFTSHADOWTRANSPSLIDER" => 128,
-		    "IDC_EDIT_REGSHAPETOOL_POS" => 128
+		    "IDC_EDIT_REGSHAPETOOL_POS" => 128,
+		    "IDC_FONT_COMBO" => 128
 		   );
     return $cnamemap{ $control } || $default;
 }
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1065)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1066)
@@ -6328,7 +6328,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxOwnerDrawnComboBox" name="IDC_FONT_COMBO">
-                    <size>80,-1</size>
+                    <size>128,-1</size>
                     <font>
                         <size>8</size>
                     </font>
Index: Trunk/XaraLX/wxOil/dropdown.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dropdown.cpp	(revision 1065)
+++ Trunk/XaraLX/wxOil/dropdown.cpp	(revision 1066)
@@ -697,10 +697,13 @@
 
 wxSize DropDown::DrawText(void * ItemData, wxDC& dc, wxRect& TextRect, INT32 item, INT32 flags, BOOL Draw)
 {
-	if ( (m_pPopup->GetSelection() == (INT32)item) && !(flags & wxCP_PAINTING_CONTROL) )
-		dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
-	else
-		dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
+	if (Draw)
+	{
+		if ( (m_pPopup->wxVListBox::GetSelection() == (INT32)item) && !(flags & wxCP_PAINTING_CONTROL) )
+			dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
+		else
+			dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
+	}
 
 	wxString Text = GetText(ItemData, item);
 	wxCoord w, h;


Xara