[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1035
Date : Sat May 13 10:05:36 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/rc2xml.pl
M /Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/simon.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/textres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/will.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
Converted all dialogs to use wxOwnerDrawnComboBox
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 1034)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 1035)
@@ -597,7 +597,7 @@
# value. wxWidgets then centres them vertically which result in a vertical offset
$rect[3]=-1;
- print OUTPUT " <object class=\"wxComboBox\"";
+ print OUTPUT " <object class=\"wxOwnerDrawnComboBox\"";
WriteBasicInfo (@rect, $varname);
WriteStyle ("wxCB_SIMPLE") if ($token =~ /CBS_SIMPLE/);
WriteStyle ("wxCB_SORT") if ($token =~ /CBS_SORT/);
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 1035)
@@ -37,7 +37,7 @@
<pos>6,140d</pos> <size>84,10d</size>
<label>Rotate by &270 degrees</label>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
<title>Flip & Rotate</title>
@@ -67,7 +67,7 @@
<pos>94,147d</pos> <size>77,10d</size>
<label>Lock &aspect ratio</label>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_DPI2">
@@ -111,7 +111,7 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxSlider" name="IDC_BFXDLG_BRIGHTNESS">
@@ -157,7 +157,7 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_BAYERMONO">
@@ -210,10 +210,10 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
<pos>5,98d</pos> <size>77,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
@@ -274,7 +274,7 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxSlider" name="IDC_BFXDLG_ALC_SATURATION_SLIDER">
@@ -388,7 +388,7 @@
<pos>6,140d</pos> <size>84,10d</size>
<label>Rotate by &270 degrees</label>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
@@ -434,7 +434,7 @@
<pos>94,147d</pos> <size>77,10d</size>
<label>Lock &aspect ratio</label>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_DPI2">
@@ -494,10 +494,10 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxSlider" name="IDC_BFXDLG_BRIGHTNESS">
@@ -559,7 +559,7 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_BAYERMONO">
@@ -629,10 +629,10 @@
<object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
<pos>5,98d</pos> <size>77,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 1035)
@@ -43,14 +43,14 @@
<pos>11,110d</pos> <size>50,10d</size>
<label>&Colour line size</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_COLOURBAR">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_COLOURBAR">
<pos>86,108d</pos> <size>105,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_AUTOCOLOURTXT">
<pos>11,127d</pos> <size>65,10d</size>
<label>&Edit local colours in </label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_AUTOCOLOUR">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_AUTOCOLOUR">
<pos>86,125d</pos> <size>105,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_OPTS_AUTOSCROLL">
@@ -120,7 +120,7 @@
<pos>10,87d</pos> <size>140,10d</size>
<label>Ask about &closing document views</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_IMPWITHLAYERS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_IMPWITHLAYERS">
<pos>70,115d</pos> <size>125,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_OPTS_EDITGRP">
@@ -131,7 +131,7 @@
<pos>12,148d</pos> <size>55,10d</size>
<label>&Angle constraint</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_ANGLECONST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_ANGLECONST">
<pos>70,146d</pos> <size>40,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_NUDGETXT">
@@ -180,7 +180,7 @@
<pos>11,29d</pos> <size>35,10d</size>
<label>Paper &size</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_SIZELIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_SIZELIST">
<pos>60,27d</pos> <size>136,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_WIDTHTXT">
@@ -370,14 +370,14 @@
<pos>11,32d</pos> <size>65,10d</size>
<label>&Left mouse button</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_LEFTBUTTON">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_LEFTBUTTON">
<pos>80,30d</pos> <size>115,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_RIGHTTXT">
<pos>11,53d</pos> <size>65,10d</size>
<label>&Right mouse button</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_RIGHTBUTTON">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_RIGHTBUTTON">
<pos>80,51d</pos> <size>115,-1d</size>
</object>
<object class="wxButton" name="IDC_OPTS_RESET">
@@ -477,14 +477,14 @@
<pos>11,30d</pos> <size>36,9d</size>
<label>&Page units:</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_PAGEUNITS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_PAGEUNITS">
<pos>51,30d</pos> <size>81,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_FONTUNITSTXT">
<pos>11,47d</pos> <size>35,9d</size>
<label>&Font units:</label>
</object>
- <object class="wxComboBox" name="IDC_OPTS_FONTUNITS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_FONTUNITS">
<pos>51,47d</pos> <size>81,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_OPTS_USERUNITSGROUP">
@@ -566,7 +566,7 @@
<object class="wxTextCtrl" name="IDC_OPTS_NUMBASEUNITS">
<pos>11,90d</pos> <size>35,12d</size>
</object>
- <object class="wxComboBox" name="IDC_OPTS_BASEUNIT">
+ <object class="wxOwnerDrawnComboBox" name="IDC_OPTS_BASEUNIT">
<pos>55,90d</pos> <size>85,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
@@ -602,10 +602,10 @@
<pos>15,55d</pos> <size>122,10d</size>
<label>New effects are locked by default</label>
</object>
- <object class="wxComboBox" name="IDC_COMBO_LIVEEFFECT_RES">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBO_LIVEEFFECT_RES">
<pos>113,70d</pos> <size>82,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_COMBO_LOCKEDEFFECT_RES">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBO_LOCKEDEFFECT_RES">
<pos>113,87d</pos> <size>82,-1d</size>
</object>
<title>Effects && Plugins</title>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 1035)
@@ -27,7 +27,7 @@
<pos>25,20d</pos> <size>85,55d</size>
<style>wxLB_SORT</style>
</object>
- <object class="wxComboBox" name="IDC_GUIDETAB_COLOURLIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GUIDETAB_COLOURLIST">
<pos>55,119d</pos> <size>70,-1d</size>
</object>
<object class="wxStaticText" name="IDC_GUIDETAB_COLOURTEXT">
Index: Trunk/XaraLX/wxOil/xrc/EN/will.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/will.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/will.xrc (revision 1035)
@@ -2,16 +2,16 @@
<resource>
<object class="wxDialog" name="IDD_GRADFILLDLG">
<pos>0,0d</pos> <size>367,39d</size>
- <object class="wxComboBox" name="IDC_GEOMETRY">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GEOMETRY">
<pos>5,15d</pos> <size>54,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_MAPPING">
+ <object class="wxOwnerDrawnComboBox" name="IDC_MAPPING">
<pos>60,15d</pos> <size>48,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_EFFECT">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EFFECT">
<pos>115,15d</pos> <size>48,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_BITMAPEFFECT">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BITMAPEFFECT">
<pos>175,15d</pos> <size>28,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BIASGAIN">
@@ -37,23 +37,23 @@
</object>
<object class="wxDialog" name="IDD_TRANFILLDLG">
<pos>0,0d</pos> <size>367,39d</size>
- <object class="wxComboBox" name="IDC_MAPPING">
+ <object class="wxOwnerDrawnComboBox" name="IDC_MAPPING">
<pos>60,15d</pos> <size>48,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_GEOMETRY">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GEOMETRY">
<pos>5,15d</pos> <size>54,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_TRANSPTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_TRANSPTYPE">
<pos>175,20d</pos> <size>48,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_EFFECT">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EFFECT">
<pos>115,15d</pos> <size>48,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BIASGAIN">
<pos>31,21d</pos> <size>19,15d</size>
<label>-</label>
</object>
- <object class="wxComboBox" name="IDC_BITMAPEFFECT">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BITMAPEFFECT">
<pos>175,15d</pos> <size>28,-1d</size>
</object>
<object class="wxSlider" name="IDC_TRANSPSLIDE">
Index: Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 1035)
@@ -22,7 +22,7 @@
<pos>167,0d</pos> <size>50,14d</size>
<label>Set new design</label>
</object>
- <object class="wxComboBox" name="IDC_ST_STATE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_ST_STATE">
<pos>225,0d</pos> <size>50,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_LIVE">
@@ -83,7 +83,7 @@
<pos>110,21d</pos> <size>50,14d</size>
<label>&Create State</label>
</object>
- <object class="wxComboBox" name="IDC_MUTATE_COLOURS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_MUTATE_COLOURS">
<pos>110,7d</pos> <size>98,-1d</size>
</object>
<object class="wxButton" name="IDC_DELETE_STATE">
@@ -127,7 +127,7 @@
<pos>7,33d</pos> <size>144,24d</size>
<label>"Set Design" will take your selection as the basis for the button design of this state. All buttons in this bar will reflect this design.</label>
</object>
- <object class="wxComboBox" name="IDC_BAR_NO_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BAR_NO_COMBO">
<pos>92,18d</pos> <size>60,-1d</size>
</object>
<title>Set button design in this State</title>
Index: Trunk/XaraLX/wxOil/xrc/EN/simon.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 1035)
@@ -13,7 +13,7 @@
<pos>7,23d</pos> <size>57,8d</size>
<label>&Direction of Bar</label>
</object>
- <object class="wxComboBox" name="IDC_BC_DIRECTION">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BC_DIRECTION">
<pos>72,21d</pos> <size>79,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
@@ -27,14 +27,14 @@
<pos>7,54d</pos> <size>64,8d</size>
<label>Button S&tretching</label>
</object>
- <object class="wxComboBox" name="IDC_BC_BUTTON_SIZE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BC_BUTTON_SIZE">
<pos>72,52d</pos> <size>79,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>7,69d</pos> <size>56,8d</size>
<label>Buttons are &All</label>
</object>
- <object class="wxComboBox" name="IDC_BC_BUTTONS_SAME">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BC_BUTTONS_SAME">
<pos>72,67d</pos> <size>79,-1d</size>
</object>
<object class="wxButton" name="IDC_BC_REDEF_BACKBAR">
Index: Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 1035)
@@ -50,16 +50,16 @@
<pos>141,3d</pos> <size>64,10d</size>
<style>wxSL_HORIZONTAL</style>
</object>
- <object class="wxComboBox" name="IDC_BEVEL_SLIDER_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_SLIDER_COMBO">
<pos>75,1d</pos> <size>60,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_BEVEL_TYPE_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_TYPE_COMBO">
<pos>9,2d</pos> <size>60,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_BEVEL_SLIDER_EDIT">
<pos>215,2d</pos> <size>35,12d</size>
</object>
- <object class="wxComboBox" name="IDC_BEVEL_INNER_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_INNER_COMBO">
<pos>260,1d</pos> <size>60,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BTN_BEVELOUTER">
Index: Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 1035)
@@ -61,11 +61,11 @@
</object>
<object class="wxPanel" name="IDD_BLOBTAB_PG3">
<pos>0,0d</pos> <size>160,100d</size>
- <object class="wxComboBox" name="IDC_TCOMBO3">
+ <object class="wxOwnerDrawnComboBox" name="IDC_TCOMBO3">
<pos>16,22d</pos> <size>56,-1d</size>
<style>wxCB_SORT</style>
</object>
- <object class="wxComboBox" name="IDC_TCOMBO4">
+ <object class="wxOwnerDrawnComboBox" name="IDC_TCOMBO4">
<pos>85,22d</pos> <size>48,-1d</size>
<style>wxCB_SORT</style>
</object>
@@ -202,11 +202,11 @@
<pos>119,130d</pos> <size>35,10d</size>
<label>Radio6</label>
</object>
- <object class="wxComboBox" name="IDC_COMBO3">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBO3">
<pos>20,182d</pos> <size>56,-1d</size>
<style>wxCB_SORT</style>
</object>
- <object class="wxComboBox" name="IDC_COMBO4">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBO4">
<pos>89,182d</pos> <size>48,-1d</size>
<style>wxCB_SORT</style>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 1035)
@@ -107,10 +107,10 @@
<pos>105,210d</pos> <size>13,10d</size>
<label>0%</label>
</object>
- <object class="wxComboBox" name="IDC_TRACER_BITMAP">
+ <object class="wxOwnerDrawnComboBox" name="IDC_TRACER_BITMAP">
<pos>2,131d</pos> <size>124,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_TRACER_METHOD">
+ <object class="wxOwnerDrawnComboBox" name="IDC_TRACER_METHOD">
<pos>2,149d</pos> <size>124,-1d</size>
</object>
<object class="wxStaticText" name="IDC_TRACER_3DFRAMEP2">
Index: Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 1035)
@@ -10,7 +10,7 @@
<pos>7,129d</pos> <size>100,15d</size>
<style>wxSL_HORIZONTAL</style>
</object>
- <object class="wxComboBox" name="IDC_BIASGAIN">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BIASGAIN">
<pos>7,7d</pos> <size>24,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_BIAS">
Index: Trunk/XaraLX/wxOil/xrc/EN/textres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 1035)
@@ -2,10 +2,10 @@
<resource>
<object class="wxDialog" name="IDD_TEXT_INFO_BAR">
<pos>0,0d</pos> <size>329,171d</size>
- <object class="wxComboBox" name="IDC_FONT_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_FONT_COMBO">
<pos>56,10d</pos> <size>68,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_POINT_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_POINT_COMBO">
<pos>135,10d</pos> <size>28,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BOLDBUTTON">
Index: Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc (revision 1035)
@@ -45,7 +45,7 @@
<pos>7,81d</pos> <size>72,8d</size>
<label>Sequence progresses:</label>
</object>
- <object class="wxComboBox" name="IDC_COMBOSEQUENCETYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOSEQUENCETYPE">
<pos>85,78d</pos> <size>48,-1d</size>
</object>
<title>Spacing</title>
@@ -64,7 +64,7 @@
<pos>9,7d</pos> <size>57,8d</size>
<label>Direction from line</label>
</object>
- <object class="wxComboBox" name="IDC_COMBOPATHOFFSETTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOPATHOFFSETTYPE">
<pos>73,4d</pos> <size>55,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_STATICPATHOFFSETRAND">
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc (revision 1035)
@@ -103,7 +103,7 @@
<object class="sizeritem">
<flag>wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
- <object class="wxComboBox" name="IDC_T1COMBO1">
+ <object class="wxOwnerDrawnComboBox" name="IDC_T1COMBO1">
<size>57,-1</size>
<pos>151,63</pos>
</object>
@@ -351,7 +351,7 @@
<object class="sizeritem">
<flag>wxALIGN_CENTER_HORIZONTAL</flag>
<border>5</border>
- <object class="wxComboBox" name="IDC_IMAPTAB_MAPNAME">
+ <object class="wxOwnerDrawnComboBox" name="IDC_IMAPTAB_MAPNAME">
<size>183,-1</size>
<pos>295,42</pos>
<style>wxCB_SORT</style>
@@ -369,7 +369,7 @@
<object class="sizeritem">
<flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
<border>5</border>
- <object class="wxComboBox" name="IDC_IMAPTAB_APPROX">
+ <object class="wxOwnerDrawnComboBox" name="IDC_IMAPTAB_APPROX">
<size>183,-1</size>
<pos>295,86</pos>
<style>wxCB_SORT</style>
@@ -576,21 +576,21 @@
<pos>7,8d</pos> <size>30,9d</size>
<label>Dithering:</label>
</object>
- <object class="wxComboBox" name="IDC_DITHERING_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_DITHERING_COMBO">
<pos>52,7d</pos> <size>83,-1d</size>
</object>
<object class="wxStaticText" name="IDC_T2STATIC2">
<pos>7,24d</pos> <size>29,9d</size>
<label>Palette:</label>
</object>
- <object class="wxComboBox" name="IDC_PALETTE_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_PALETTE_COMBO">
<pos>52,23d</pos> <size>83,-1d</size>
</object>
<object class="wxStaticText" name="IDC_T2STATIC3">
<pos>7,40d</pos> <size>42,9d</size>
<label>Colour depth:</label>
</object>
- <object class="wxComboBox" name="IDC_COLOUR_DEPTH_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COLOUR_DEPTH_COMBO">
<pos>52,38d</pos> <size>83,-1d</size>
</object>
<object class="wxStaticText" name="IDC_T2STATIC4">
@@ -600,7 +600,7 @@
<object class="wxTextCtrl" name="IDC_COLOURS_USED_EDIT">
<pos>52,54d</pos> <size>23,12d</size>
</object>
- <object class="wxComboBox" name="IDC_COLOR_MODEL_LIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COLOR_MODEL_LIST">
<pos>80,54d</pos> <size>55,-1d</size>
</object>
<object class="wxStaticText" name="IDC_T2STATIC6">
@@ -663,7 +663,7 @@
<pos>267,73d</pos> <size>25,9d</size>
<label>Sort By:</label>
</object>
- <object class="wxComboBox" name="IDC_T2_SORT_LIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_T2_SORT_LIST">
<pos>296,71d</pos> <size>68,-1d</size>
</object>
<title>Palette Options</title>
Index: Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 1035)
@@ -13,7 +13,7 @@
<object class="wxTextCtrl" name="IDC_NEWCOL_NAME">
<pos>28,4d</pos> <size>100,13d</size>
</object>
- <object class="wxComboBox" name="IDC_NEWCOL_COLLIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_NEWCOL_COLLIST">
<pos>4,36d</pos> <size>124,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
Index: Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 1035)
@@ -2,7 +2,7 @@
<resource>
<object class="wxDialog" name="IDD_COLOUREDITDLG">
<pos>0,0d</pos> <size>142,126d</size>
- <object class="wxComboBox" name="IDC_EDIT_NAMEMENU">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_NAMEMENU">
<pos>4,4d</pos> <size>85,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_MAKESTYLE">
@@ -35,17 +35,17 @@
<object class="wxTextCtrl" name="IDC_EDIT_WEBHEX">
<pos>54,128d</pos> <size>40,12d</size>
</object>
- <object class="wxComboBox" name="IDC_EDIT_COLMODEL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
<pos>4,144d</pos> <size>104,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_EDIT_3D">
<pos>112,144d</pos> <size>24,12d</size>
<label>&3D</label>
</object>
- <object class="wxComboBox" name="IDC_EDIT_COLTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
<pos>4,184d</pos> <size>133,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_EDIT_PARENTCOL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
<pos>33,200d</pos> <size>103,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_TINT">
Index: Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1035)
@@ -33,14 +33,14 @@
<pos>6,122d</pos> <size>140,9d</size>
<label>List Files of &Type:</label>
</object>
- <object class="wxComboBox" name="ID_STATICDECIMAL_1136">
+ <object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1136">
<pos>6,132d</pos> <size>140,-1d</size>
</object>
<object class="wxStaticText" name="ID_STATICDECIMAL_1091">
<pos>6,122d</pos> <size>142,9d</size>
<label>Dri&ves:</label>
</object>
- <object class="wxComboBox" name="ID_STATICDECIMAL_1137">
+ <object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1137">
<pos>6,132d</pos> <size>142,-1d</size>
<style>wxCB_SORT</style>
</object>
@@ -100,14 +100,14 @@
<pos>6,122d</pos> <size>90,9d</size>
<label>List Files of &Type:</label>
</object>
- <object class="wxComboBox" name="ID_STATICDECIMAL_1136">
+ <object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1136">
<pos>6,132d</pos> <size>90,-1d</size>
</object>
<object class="wxStaticText" name="ID_STATICDECIMAL_1091">
<pos>6,122d</pos> <size>142,9d</size>
<label>Dri&ves:</label>
</object>
- <object class="wxComboBox" name="ID_STATICDECIMAL_1137">
+ <object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1137">
<pos>6,132d</pos> <size>142,-1d</size>
<style>wxCB_SORT</style>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 1035)
@@ -27,10 +27,10 @@
<pos>59,107d</pos> <size>35,10d</size>
<label>Spread</label>
</object>
- <object class="wxComboBox" name="IDC_ALIGNDIALOG_HORIZONTAL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_ALIGNDIALOG_HORIZONTAL">
<pos>4,133d</pos> <size>105,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_ALIGNDIALOG_VERTICAL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_ALIGNDIALOG_VERTICAL">
<pos>4,158d</pos> <size>105,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
Index: Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 1035)
@@ -168,7 +168,7 @@
<object class="wxTextCtrl" name="IDC_DPIEDIT">
<pos>115,106d</pos> <size>25,13d</size>
</object>
- <object class="wxComboBox" name="IDC_FILLQUALLIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_FILLQUALLIST">
<pos>48,145d</pos> <size>48,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_GROUP_PRINTLAYERS">
@@ -332,7 +332,7 @@
<pos>4,-1096d</pos> <size>56,9d</size>
<label>Print &Quality:</label>
</object>
- <object class="wxComboBox" name="cmb1">
+ <object class="wxOwnerDrawnComboBox" name="cmb1">
<pos>55,-1094d</pos> <size>81,-1d</size>
</object>
<object class="wxStaticText" name="stc5">
@@ -364,7 +364,7 @@
</object>
<object class="wxDialog" name="IDD_XSEPSOPS">
<pos>0,0d</pos> <size>194,74d</size>
- <object class="wxComboBox" name="IDC_DPIEDIT">
+ <object class="wxOwnerDrawnComboBox" name="IDC_DPIEDIT">
<pos>10,23d</pos> <size>35,-1d</size>
<style>wxCB_SORT</style>
</object>
@@ -409,15 +409,15 @@
<pos>13,92d</pos> <size>22,9d</size>
<label> </label>
</object>
- <object class="wxComboBox" name="IDC_COMBORESOLUTION">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBORESOLUTION">
<pos>110,43d</pos> <size>62,-1d</size>
<style>wxCB_SORT</style>
</object>
- <object class="wxComboBox" name="IDC_COMBOFREQUENCY">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOFREQUENCY">
<pos>110,59d</pos> <size>62,-1d</size>
<style>wxCB_SORT</style>
</object>
- <object class="wxComboBox" name="IDC_COMBOTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOTYPE">
<pos>110,75d</pos> <size>84,-1d</size>
<style>wxCB_SORT</style>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 1035)
@@ -21,7 +21,7 @@
<pos>13,141d</pos> <size>155,8d</size>
<label>File Difference:</label>
</object>
- <object class="wxComboBox" name="IDC_FILE_TYPE_LIST">
+ <object class="wxOwnerDrawnComboBox" name="IDC_FILE_TYPE_LIST">
<pos>121,0d</pos> <size>48,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_ACTIVE2">
@@ -43,7 +43,7 @@
<pos>218,141d</pos> <size>155,8d</size>
<label>File Difference:</label>
</object>
- <object class="wxComboBox" name="IDC_FILE_TYPE_LIST2">
+ <object class="wxOwnerDrawnComboBox" name="IDC_FILE_TYPE_LIST2">
<pos>326,0d</pos> <size>48,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_ZOOM_TOOL">
Index: Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 1035)
@@ -18,10 +18,10 @@
<pos>6,23d</pos> <size>166,93d</size>
<label>Check List Box Placeholder</label>
</object>
- <object class="wxComboBox" name="IDC_ES_COMBO_XBEHAVIOUR">
+ <object class="wxOwnerDrawnComboBox" name="IDC_ES_COMBO_XBEHAVIOUR">
<pos>6,155d</pos> <size>75,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_ES_COMBO_YBEHAVIOUR">
+ <object class="wxOwnerDrawnComboBox" name="IDC_ES_COMBO_YBEHAVIOUR">
<pos>92,155d</pos> <size>78,-1d</size>
</object>
<object class="wxStaticText" name="IDC_ES_HORIZONTAL">
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 1035)
@@ -26,7 +26,7 @@
<pos>35,37d</pos> <size>12,10d</size>
<label>&dpi</label>
</object>
- <object class="wxComboBox" name="IDC_BMPOPTS_RES">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BMPOPTS_RES">
<pos>50,35d</pos> <size>70,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
@@ -106,7 +106,7 @@
<pos>204,100d</pos> <size>31,10d</size>
<label>RGB</label>
</object>
- <object class="wxComboBox" name="IDC_BMPOPTS_TIFF">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BMPOPTS_TIFF">
<pos>165,99d</pos> <size>70,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
@@ -193,7 +193,7 @@
<pos>210,167d</pos> <size>20,10d</size>
<label>times</label>
</object>
- <object class="wxComboBox" name="IDC_ANIMOPTS_REMOVAL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_ANIMOPTS_REMOVAL">
<pos>55,180d</pos> <size>67,-1d</size>
</object>
<object class="wxStaticText" name="IDC_RESTORE_STATIC">
@@ -248,7 +248,7 @@
<pos>35,37d</pos> <size>12,10d</size>
<label>&dpi</label>
</object>
- <object class="wxComboBox" name="IDC_BMPOPTS_RES">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BMPOPTS_RES">
<pos>50,35d</pos> <size>70,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
Index: Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 1035)
@@ -2,11 +2,11 @@
<resource>
<object class="wxDialog" name="IDD_EXPORT_IMAGEMAP">
<pos>0,0d</pos> <size>188,165d</size>
- <object class="wxComboBox" name="IDC_IMAGEMAP_MAPNAME">
+ <object class="wxOwnerDrawnComboBox" name="IDC_IMAGEMAP_MAPNAME">
<pos>45,7d</pos> <size>135,-1d</size>
<style>wxCB_SORT</style>
</object>
- <object class="wxComboBox" name="IDC_IMAGEMAP_APPROX">
+ <object class="wxOwnerDrawnComboBox" name="IDC_IMAGEMAP_APPROX">
<pos>106,26d</pos> <size>75,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_IMAGEMAP_WIDTH">
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 1035)
@@ -5,7 +5,7 @@
<object class="wxTextCtrl" name="IDC_SETDELAY">
<pos>70,114d</pos> <size>34,12d</size>
</object>
- <object class="wxComboBox" name="IDC_SETREMOVAL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_SETREMOVAL">
<pos>70,134d</pos> <size>68,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
Index: Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 1035)
@@ -2,7 +2,7 @@
<resource>
<object class="wxDialog" name="IDD_COLOUREDITDLG">
<pos>0,0d</pos> <size>143,241d</size>
- <object class="wxComboBox" name="IDC_EDIT_NAMEMENU">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_NAMEMENU">
<pos>4,4d</pos> <size>85,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_LINEFILL">
@@ -29,17 +29,17 @@
<object class="wxTextCtrl" name="IDC_EDIT_COMPONENT4">
<pos>96,128d</pos> <size>20,12d</size>
</object>
- <object class="wxComboBox" name="IDC_EDIT_COLMODEL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
<pos>400,147d</pos> <size>104,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_EDIT_3D">
<pos>11200,147d</pos> <size>24,12d</size>
<label>&3D</label>
</object>
- <object class="wxComboBox" name="IDC_EDIT_COLTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
<pos>3,165d</pos> <size>135,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_EDIT_PARENTCOL">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
<pos>36,183d</pos> <size>103,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_TINT">
Index: Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 1035)
@@ -381,16 +381,16 @@
<pos>186,50d</pos> <size>16,16d</size>
<label>-</label>
</object>
- <object class="wxComboBox" name="IDCB_ZOOM_COMBO_BOX">
+ <object class="wxOwnerDrawnComboBox" name="IDCB_ZOOM_COMBO_BOX">
<pos>291,12d</pos> <size>36,-1d</size>
</object>
- <object class="wxComboBox" name="IDCB_LINEWIDTH_COMBO_BOX">
+ <object class="wxOwnerDrawnComboBox" name="IDCB_LINEWIDTH_COMBO_BOX">
<pos>258,12d</pos> <size>32,-1d</size>
</object>
- <object class="wxComboBox" name="IDLB_JOINTYPE_LIST_BOX">
+ <object class="wxOwnerDrawnComboBox" name="IDLB_JOINTYPE_LIST_BOX">
<pos>300,12d</pos> <size>46,-1d</size>
</object>
- <object class="wxComboBox" name="IDLB_LINECAP_LIST_BOX">
+ <object class="wxOwnerDrawnComboBox" name="IDLB_LINECAP_LIST_BOX">
<pos>300,12d</pos> <size>43,-1d</size>
</object>
<title>Dummy standard bar</title>
@@ -403,16 +403,16 @@
</object>
<object class="wxDialog" name="IDD_GRIDDLG">
<pos>0,0d</pos> <size>329,21d</size>
- <object class="wxComboBox" name="IDC_UNITS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_UNITS">
<pos>63,4d</pos> <size>54,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_GRIDTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GRIDTYPE">
<pos>183,4d</pos> <size>54,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_DIVISIONS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_DIVISIONS">
<pos>6,4d</pos> <size>48,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_SUBDIVISIONS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_SUBDIVISIONS">
<pos>126,4d</pos> <size>48,-1d</size>
</object>
<object class="wxButton" name="IDC_MAKEGRID">
@@ -424,16 +424,16 @@
</object>
<object class="wxDialog" name="IDD_GRIDTOOL">
<pos>0,0d</pos> <size>394,22d</size>
- <object class="wxComboBox" name="IDC_DIVISIONS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_DIVISIONS">
<pos>5,5d</pos> <size>36,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_UNITS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_UNITS">
<pos>46,5d</pos> <size>54,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_SUBDIVISIONS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_SUBDIVISIONS">
<pos>105,5d</pos> <size>36,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_GRIDTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GRIDTYPE">
<pos>146,5d</pos> <size>54,-1d</size>
</object>
<title></title>
@@ -546,7 +546,7 @@
</object>
<object class="wxDialog" name="IDD_INFOBAR">
<pos>0,0d</pos> <size>122,19d</size>
- <object class="wxComboBox" name="IDC_LAYER_COMBO">
+ <object class="wxOwnerDrawnComboBox" name="IDC_LAYER_COMBO">
<pos>10,3d</pos> <size>88,-1d</size>
</object>
<object class="wxButton" name="IDC_INVOKE_LYR_DLG">
@@ -661,10 +661,10 @@
<pos>7,20d</pos> <size>24,9d</size>
<label>Spacing:</label>
</object>
- <object class="wxComboBox" name="IDC_BRUSHTYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_BRUSHTYPE">
<pos>175,15d</pos> <size>28,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_STROKETYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_STROKETYPE">
<pos>175,15d</pos> <size>28,-1d</size>
</object>
<title></title>
@@ -684,7 +684,7 @@
<pos>5,25d</pos> <size>10,14d</size>
<style>wxSP_VERTICAL</style>
</object>
- <object class="wxComboBox" name="IDC_COMBOBOX_LE_ORDER2">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_ORDER2">
<pos>5,5d</pos> <size>85,-1d</size>
<style>wxCB_SORT</style>
</object>
@@ -692,7 +692,7 @@
<pos>10,45d</pos> <size>50,8d</size>
<label>Change/Insert</label>
</object>
- <object class="wxComboBox" name="IDC_COMBOBOX_LE_TYPE2">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_TYPE2">
<pos>5,60d</pos> <size>85,-1d</size>
<style>wxCB_SORT</style>
</object>
@@ -708,10 +708,10 @@
<pos>5,120d</pos> <size>40,14d</size>
<label>Remove All</label>
</object>
- <object class="wxComboBox" name="IDC_COMBOBOX_LE_TYPE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_TYPE">
<pos>100,60d</pos> <size>70,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_COMBOBOX_LE_ORDER">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_ORDER">
<pos>100,5d</pos> <size>100,-1d</size>
</object>
<object class="wxButton" name="IDC_BUTTON_LE_ADD">
@@ -758,7 +758,7 @@
<pos>55,120d</pos> <size>40,14d</size>
<label>Setup...</label>
</object>
- <object class="wxComboBox" name="IDC_COMBOBOX_LE_RES">
+ <object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_RES">
<pos>205,60d</pos> <size>40,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_CCBUTTON_LE_TOGGLELOCK">
Index: Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 1035)
@@ -6,7 +6,7 @@
<pos>8,12d</pos> <size>32,8d</size>
<label>Add:</label>
</object>
- <object class="wxComboBox" name="IDC_EDIT_REGSHAPETOOL_SIDES">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_REGSHAPETOOL_SIDES">
<pos>147,73d</pos> <size>27,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BTN_REGSHAPETOOL_RADIUS">
@@ -37,7 +37,7 @@
<pos>95,51d</pos> <size>16,16d</size>
<label>-</label>
</object>
- <object class="wxComboBox" name="IDC_EDIT_REGSHAPETOOL_POS">
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_REGSHAPETOOL_POS">
<pos>73,13d</pos> <size>68,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_REGSHAPETOOL_UPPER">
Index: Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 1035)
@@ -258,10 +258,10 @@
<pos>116,92d</pos> <size>36,12d</size>
<label>Export</label>
</object>
- <object class="wxComboBox" name="IDC_NAMEGAL_PROP_IDX">
+ <object class="wxOwnerDrawnComboBox" name="IDC_NAMEGAL_PROP_IDX">
<pos>116,92d</pos> <size>36,-1d</size>
</object>
- <object class="wxComboBox" name="IDC_LIBGAL_CLIPTHEME">
+ <object class="wxOwnerDrawnComboBox" name="IDC_LIBGAL_CLIPTHEME">
<pos>116,92d</pos> <size>45,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
@@ -289,7 +289,7 @@
</object>
<object class="wxDialog" name="IDD_SGDISPLAY">
<pos>0,0d</pos> <size>146,39d</size>
- <object class="wxComboBox" name="IDC_SGDISPLAY_DMODE">
+ <object class="wxOwnerDrawnComboBox" name="IDC_SGDISPLAY_DMODE">
<pos>4,5d</pos> <size>139,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
@@ -365,14 +365,14 @@
</object>
<object class="wxDialog" name="IDD_SGSORT">
<pos>0,0d</pos> <size>227,73d</size>
- <object class="wxComboBox" name="IDC_GALSORT_SORT1">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GALSORT_SORT1">
<pos>7,17d</pos> <size>76,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_GALSORT_REVERSE1">
<pos>23,33d</pos> <size>44,10d</size>
<label>&Reversed</label>
</object>
- <object class="wxComboBox" name="IDC_GALSORT_SORT2">
+ <object class="wxOwnerDrawnComboBox" name="IDC_GALSORT_SORT2">
<pos>95,17d</pos> <size>76,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_GALSORT_REVERSE2">
Index: Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 1035)
@@ -9,7 +9,7 @@
<pos>127,33d</pos> <size>97,11d</size>
<label>Correct URL automatically</label>
</object>
- <object class="wxComboBox" name="IDC_WEBADDRESS_FRAME">
+ <object class="wxOwnerDrawnComboBox" name="IDC_WEBADDRESS_FRAME">
<pos>7,53d</pos> <size>218,-1d</size>
<style>wxCB_SORT</style>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 1034)
+++ Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 1035)
@@ -28,7 +28,7 @@
<pos>15,8d</pos> <size>20,8d</size>
<label>Group</label>
</object>
- <object class="wxComboBox" name="IDC_DEBUGDLG_GROUP">
+ <object class="wxOwnerDrawnComboBox" name="IDC_DEBUGDLG_GROUP">
<pos>40,5d</pos> <size>130,-1d</size>
</object>
<title>Camelot debug commands</title>
Xara