[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 815
Date : Fri Apr 14 16:02:29 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.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
Fix vertical positioning of combo boxes within dialogs
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 814)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 815)
@@ -554,6 +554,10 @@
ReadOrs (\$token) unless $GotOrs;
}
+ # Set height to -1 as for some reason Camelot combo boxes have a ridiculous height
+ # value. wxWidgets then centres them vertically which result in a vertical offset
+ $rect[3]=-1;
+
print OUTPUT " <object class=\"wxComboBox\"";
WriteBasicInfo (@rect, $varname);
WriteStyle ("wxCB_SIMPLE") if ($token =~ /CBS_SIMPLE/);
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 815)
@@ -37,7 +37,7 @@
<label>Rotate by &270 degrees</label>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<title>Flip & Rotate</title>
</object>
@@ -66,7 +66,7 @@
<label>Lock &aspect ratio</label>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_DPI2">
<pos>59,109d</pos> <size>49,8d</size>
@@ -109,7 +109,7 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxSlider" name="IDC_BFXDLG_BRIGHTNESS">
<pos>67,98d</pos> <size>102,14d</size>
@@ -154,7 +154,7 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_BAYERMONO">
<pos>4,103d</pos> <size>82,10d</size>
@@ -206,10 +206,10 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
- <pos>5,98d</pos> <size>77,12d</size>
+ <pos>5,98d</pos> <size>77,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
<pos>99,83d</pos> <size>68,59d</size>
@@ -269,7 +269,7 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxSlider" name="IDC_BFXDLG_ALC_SATURATION_SLIDER">
<pos>54,112d</pos> <size>28,14d</size>
@@ -382,7 +382,7 @@
<label>Rotate by &270 degrees</label>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>37,13d</size>
+ <pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
<pos>5,155d</pos> <size>40,13d</size>
@@ -427,7 +427,7 @@
<label>Lock &aspect ratio</label>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>37,13d</size>
+ <pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_DPI2">
<pos>59,109d</pos> <size>49,8d</size>
@@ -486,10 +486,10 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>77,12d</size>
+ <pos>5,81d</pos> <size>77,-1d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>37,13d</size>
+ <pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxSlider" name="IDC_BFXDLG_BRIGHTNESS">
<pos>67,98d</pos> <size>102,14d</size>
@@ -550,7 +550,7 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>37,13d</size>
+ <pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_BAYERMONO">
<pos>4,103d</pos> <size>82,10d</size>
@@ -619,10 +619,10 @@
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
- <pos>5,81d</pos> <size>37,13d</size>
+ <pos>5,81d</pos> <size>37,-1d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
- <pos>5,98d</pos> <size>77,12d</size>
+ <pos>5,98d</pos> <size>77,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
<pos>99,83d</pos> <size>68,59d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 815)
@@ -44,14 +44,14 @@
<label>&Colour line size</label>
</object>
<object class="wxComboBox" name="IDC_OPTS_COLOURBAR">
- <pos>86,108d</pos> <size>105,20d</size>
+ <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">
- <pos>86,125d</pos> <size>105,20d</size>
+ <pos>86,125d</pos> <size>105,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_OPTS_AUTOSCROLL">
<pos>11,141d</pos> <size>125,10d</size>
@@ -120,7 +120,7 @@
<label>Ask about &closing document views</label>
</object>
<object class="wxComboBox" name="IDC_OPTS_IMPWITHLAYERS">
- <pos>70,115d</pos> <size>125,48d</size>
+ <pos>70,115d</pos> <size>125,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_OPTS_EDITGRP">
<pos>5,136d</pos> <size>195,49d</size>
@@ -131,7 +131,7 @@
<label>&Angle constraint</label>
</object>
<object class="wxComboBox" name="IDC_OPTS_ANGLECONST">
- <pos>70,146d</pos> <size>40,15d</size>
+ <pos>70,146d</pos> <size>40,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_NUDGETXT">
<pos>116,148d</pos> <size>37,10d</size>
@@ -179,7 +179,7 @@
<label>Paper &size</label>
</object>
<object class="wxComboBox" name="IDC_OPTS_SIZELIST">
- <pos>60,27d</pos> <size>136,15d</size>
+ <pos>60,27d</pos> <size>136,-1d</size>
</object>
<object class="wxStaticText" name="IDC_OPTS_WIDTHTXT">
<pos>37,48d</pos> <size>20,10d</size>
@@ -363,14 +363,14 @@
<label>&Left mouse button</label>
</object>
<object class="wxComboBox" name="IDC_OPTS_LEFTBUTTON">
- <pos>80,30d</pos> <size>115,15d</size>
+ <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">
- <pos>80,51d</pos> <size>115,15d</size>
+ <pos>80,51d</pos> <size>115,-1d</size>
</object>
<object class="wxButton" name="IDC_OPTS_RESET">
<pos>120,72d</pos> <size>75,15d</size>
@@ -467,14 +467,14 @@
<label>&Page units:</label>
</object>
<object class="wxComboBox" name="IDC_OPTS_PAGEUNITS">
- <pos>51,30d</pos> <size>81,60d</size>
+ <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">
- <pos>51,47d</pos> <size>81,60d</size>
+ <pos>51,47d</pos> <size>81,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_OPTS_USERUNITSGROUP">
<pos>5,75d</pos> <size>195,105d</size>
@@ -553,7 +553,7 @@
<pos>11,90d</pos> <size>35,12d</size>
</object>
<object class="wxComboBox" name="IDC_OPTS_BASEUNIT">
- <pos>55,90d</pos> <size>85,67d</size>
+ <pos>55,90d</pos> <size>85,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
<pos>180,10d</pos> <size>50,14d</size>
@@ -588,10 +588,10 @@
<label>New effects are locked by default</label>
</object>
<object class="wxComboBox" name="IDC_COMBO_LIVEEFFECT_RES">
- <pos>113,70d</pos> <size>82,30d</size>
+ <pos>113,70d</pos> <size>82,-1d</size>
</object>
<object class="wxComboBox" name="IDC_COMBO_LOCKEDEFFECT_RES">
- <pos>113,87d</pos> <size>82,30d</size>
+ <pos>113,87d</pos> <size>82,-1d</size>
</object>
<title>Effects && Plugins</title>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 815)
@@ -27,7 +27,7 @@
<style>wxLB_SORT</style>
</object>
<object class="wxComboBox" name="IDC_GUIDETAB_COLOURLIST">
- <pos>55,119d</pos> <size>70,96d</size>
+ <pos>55,119d</pos> <size>70,-1d</size>
</object>
<object class="wxStaticText" name="IDC_GUIDETAB_COLOURTEXT">
<pos>25,121d</pos> <size>25,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/will.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/will.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/will.xrc (revision 815)
@@ -3,16 +3,16 @@
<object class="wxDialog" name="IDD_GRADFILLDLG">
<pos>0,0d</pos> <size>367,39d</size>
<object class="wxComboBox" name="IDC_GEOMETRY">
- <pos>5,15d</pos> <size>54,55d</size>
+ <pos>5,15d</pos> <size>54,-1d</size>
</object>
<object class="wxComboBox" name="IDC_MAPPING">
- <pos>60,15d</pos> <size>48,35d</size>
+ <pos>60,15d</pos> <size>48,-1d</size>
</object>
<object class="wxComboBox" name="IDC_EFFECT">
- <pos>115,15d</pos> <size>48,35d</size>
+ <pos>115,15d</pos> <size>48,-1d</size>
</object>
<object class="wxComboBox" name="IDC_BITMAPEFFECT">
- <pos>175,15d</pos> <size>28,11d</size>
+ <pos>175,15d</pos> <size>28,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BIASGAIN">
<pos>31,21d</pos> <size>19,15d</size>
@@ -37,23 +37,23 @@
<object class="wxDialog" name="IDD_TRANFILLDLG">
<pos>0,0d</pos> <size>367,39d</size>
<object class="wxComboBox" name="IDC_MAPPING">
- <pos>60,15d</pos> <size>48,35d</size>
+ <pos>60,15d</pos> <size>48,-1d</size>
</object>
<object class="wxComboBox" name="IDC_GEOMETRY">
- <pos>5,15d</pos> <size>54,55d</size>
+ <pos>5,15d</pos> <size>54,-1d</size>
</object>
<object class="wxComboBox" name="IDC_TRANSPTYPE">
- <pos>175,20d</pos> <size>48,35d</size>
+ <pos>175,20d</pos> <size>48,-1d</size>
</object>
<object class="wxComboBox" name="IDC_EFFECT">
- <pos>115,15d</pos> <size>48,35d</size>
+ <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">
- <pos>175,15d</pos> <size>28,12d</size>
+ <pos>175,15d</pos> <size>28,-1d</size>
</object>
<object class="wxSlider" name="IDC_TRANSPSLIDE">
<pos>230,3d</pos> <size>64,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 815)
@@ -23,7 +23,7 @@
<label>Set new design</label>
</object>
<object class="wxComboBox" name="IDC_ST_STATE">
- <pos>225,0d</pos> <size>50,120d</size>
+ <pos>225,0d</pos> <size>50,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_LIVE">
<pos>386,2d</pos> <size>52,10d</size>
@@ -82,7 +82,7 @@
<label>&Create State</label>
</object>
<object class="wxComboBox" name="IDC_MUTATE_COLOURS">
- <pos>110,7d</pos> <size>98,55d</size>
+ <pos>110,7d</pos> <size>98,-1d</size>
</object>
<object class="wxButton" name="IDC_DELETE_STATE">
<pos>110,40d</pos> <size>50,14d</size>
@@ -125,7 +125,7 @@
<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">
- <pos>92,18d</pos> <size>60,55d</size>
+ <pos>92,18d</pos> <size>60,-1d</size>
</object>
<title>Set button design in this State</title>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 815)
@@ -36,7 +36,7 @@
<label>DPI</label>
</object>
<object class="wxComboBox" name="IDC_T1COMBO1">
- <pos>101,39d</pos> <size>38,12d</size>
+ <pos>101,39d</pos> <size>38,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_STATIC_HTML">
<pos>4,62d</pos> <size>205,21d</size>
@@ -116,7 +116,7 @@
<label>Name</label>
</object>
<object class="wxComboBox" name="IDC_IMAPTAB_MAPNAME">
- <pos>197,26d</pos> <size>122,16d</size>
+ <pos>197,26d</pos> <size>122,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxStaticText" name="IDC_IMAPTAB_STATIC2">
@@ -124,7 +124,7 @@
<label>Approximate curves with lines</label>
</object>
<object class="wxComboBox" name="IDC_IMAPTAB_APPROX">
- <pos>197,53d</pos> <size>122,16d</size>
+ <pos>197,53d</pos> <size>122,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxCheckBox" name="IDC_IMAPTAB_RECTANGLES">
@@ -233,21 +233,21 @@
<label>Dithering:</label>
</object>
<object class="wxComboBox" name="IDC_DITHERING_COMBO">
- <pos>52,7d</pos> <size>83,30d</size>
+ <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">
- <pos>52,23d</pos> <size>83,30d</size>
+ <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">
- <pos>52,38d</pos> <size>83,30d</size>
+ <pos>52,38d</pos> <size>83,-1d</size>
</object>
<object class="wxStaticText" name="IDC_T2STATIC4">
<pos>7,56d</pos> <size>43,9d</size>
@@ -257,7 +257,7 @@
<pos>52,54d</pos> <size>23,12d</size>
</object>
<object class="wxComboBox" name="IDC_COLOR_MODEL_LIST">
- <pos>80,54d</pos> <size>55,62d</size>
+ <pos>80,54d</pos> <size>55,-1d</size>
</object>
<object class="wxStaticText" name="IDC_T2STATIC6">
<pos>7,72d</pos> <size>20,9d</size>
@@ -320,7 +320,7 @@
<label>Sort By:</label>
</object>
<object class="wxComboBox" name="IDC_T2_SORT_LIST">
- <pos>296,71d</pos> <size>68,30d</size>
+ <pos>296,71d</pos> <size>68,-1d</size>
</object>
<title>Palette Options</title>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/simon.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 815)
@@ -14,7 +14,7 @@
<label>&Direction of Bar</label>
</object>
<object class="wxComboBox" name="IDC_BC_DIRECTION">
- <pos>72,21d</pos> <size>79,59d</size>
+ <pos>72,21d</pos> <size>79,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>7,38d</pos> <size>60,8d</size>
@@ -28,14 +28,14 @@
<label>Button S&tretching</label>
</object>
<object class="wxComboBox" name="IDC_BC_BUTTON_SIZE">
- <pos>72,52d</pos> <size>79,59d</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">
- <pos>72,67d</pos> <size>79,59d</size>
+ <pos>72,67d</pos> <size>79,-1d</size>
</object>
<object class="wxButton" name="IDC_BC_REDEF_BACKBAR">
<pos>7,84d</pos> <size>70,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 815)
@@ -50,16 +50,16 @@
<style>wxSL_HORIZONTAL</style>
</object>
<object class="wxComboBox" name="IDC_BEVEL_SLIDER_COMBO">
- <pos>75,1d</pos> <size>60,12d</size>
+ <pos>75,1d</pos> <size>60,-1d</size>
</object>
<object class="wxComboBox" name="IDC_BEVEL_TYPE_COMBO">
- <pos>9,2d</pos> <size>60,12d</size>
+ <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">
- <pos>260,1d</pos> <size>60,12d</size>
+ <pos>260,1d</pos> <size>60,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BTN_BEVELOUTER">
<pos>6,21d</pos> <size>19,15d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 815)
@@ -60,11 +60,11 @@
<object class="wxDialog" name="IDD_BLOBTAB_PG3">
<pos>0,0d</pos> <size>160,100d</size>
<object class="wxComboBox" name="IDC_TCOMBO3">
- <pos>16,22d</pos> <size>56,57d</size>
+ <pos>16,22d</pos> <size>56,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxComboBox" name="IDC_TCOMBO4">
- <pos>85,22d</pos> <size>48,57d</size>
+ <pos>85,22d</pos> <size>48,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxStaticText" name="IDC_TSTDEF">
@@ -200,11 +200,11 @@
<label>Radio6</label>
</object>
<object class="wxComboBox" name="IDC_COMBO3">
- <pos>20,182d</pos> <size>56,57d</size>
+ <pos>20,182d</pos> <size>56,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxComboBox" name="IDC_COMBO4">
- <pos>89,182d</pos> <size>48,57d</size>
+ <pos>89,182d</pos> <size>48,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxStaticBox" name="IDC_STCONV">
Index: Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 815)
@@ -108,10 +108,10 @@
<label>0%</label>
</object>
<object class="wxComboBox" name="IDC_TRACER_BITMAP">
- <pos>2,131d</pos> <size>124,30d</size>
+ <pos>2,131d</pos> <size>124,-1d</size>
</object>
<object class="wxComboBox" name="IDC_TRACER_METHOD">
- <pos>2,149d</pos> <size>124,30d</size>
+ <pos>2,149d</pos> <size>124,-1d</size>
</object>
<object class="wxStaticText" name="IDC_TRACER_3DFRAMEP2">
<pos>135,131d</pos> <size>124,11d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 815)
@@ -11,7 +11,7 @@
<style>wxSL_HORIZONTAL</style>
</object>
<object class="wxComboBox" name="IDC_BIASGAIN">
- <pos>7,7d</pos> <size>24,16d</size>
+ <pos>7,7d</pos> <size>24,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_BIAS">
<pos>95,102d</pos> <size>22,12d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/textres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 815)
@@ -3,10 +3,10 @@
<object class="wxDialog" name="IDD_TEXT_INFO_BAR">
<pos>0,0d</pos> <size>329,171d</size>
<object class="wxComboBox" name="IDC_FONT_COMBO">
- <pos>56,10d</pos> <size>68,126d</size>
+ <pos>56,10d</pos> <size>68,-1d</size>
</object>
<object class="wxComboBox" name="IDC_POINT_COMBO">
- <pos>135,10d</pos> <size>28,105d</size>
+ <pos>135,10d</pos> <size>28,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BOLDBUTTON">
<pos>168,9d</pos> <size>14,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc (revision 815)
@@ -46,7 +46,7 @@
<label>Sequence progresses:</label>
</object>
<object class="wxComboBox" name="IDC_COMBOSEQUENCETYPE">
- <pos>85,78d</pos> <size>48,100d</size>
+ <pos>85,78d</pos> <size>48,-1d</size>
</object>
<title>Spacing</title>
</object>
@@ -64,7 +64,7 @@
<label>Direction from line</label>
</object>
<object class="wxComboBox" name="IDC_COMBOPATHOFFSETTYPE">
- <pos>73,4d</pos> <size>55,100d</size>
+ <pos>73,4d</pos> <size>55,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_STATICPATHOFFSETRAND">
<pos>3,48d</pos> <size>182,39d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 815)
@@ -14,7 +14,7 @@
<pos>28,4d</pos> <size>100,13d</size>
</object>
<object class="wxComboBox" name="IDC_NEWCOL_COLLIST">
- <pos>4,36d</pos> <size>124,132d</size>
+ <pos>4,36d</pos> <size>124,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>4,6d</pos> <size>24,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 815)
@@ -3,7 +3,7 @@
<object class="wxDialog" name="IDD_COLOUREDITDLG">
<pos>0,0d</pos> <size>142,126d</size>
<object class="wxComboBox" name="IDC_EDIT_NAMEMENU">
- <pos>4,4d</pos> <size>85,160d</size>
+ <pos>4,4d</pos> <size>85,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_MAKESTYLE">
<pos>92,4d</pos> <size>18,14d</size>
@@ -36,17 +36,17 @@
<pos>54,128d</pos> <size>40,12d</size>
</object>
<object class="wxComboBox" name="IDC_EDIT_COLMODEL">
- <pos>4,144d</pos> <size>104,60d</size>
+ <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">
- <pos>4,184d</pos> <size>133,48d</size>
+ <pos>4,184d</pos> <size>133,-1d</size>
</object>
<object class="wxComboBox" name="IDC_EDIT_PARENTCOL">
- <pos>33,200d</pos> <size>103,160d</size>
+ <pos>33,200d</pos> <size>103,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_TINT">
<pos>28,219d</pos> <size>20,13d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 815)
@@ -34,14 +34,14 @@
<label>List Files of &Type:</label>
</object>
<object class="wxComboBox" name="ID_STATICDECIMAL_1136">
- <pos>6,132d</pos> <size>140,36d</size>
+ <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">
- <pos>6,132d</pos> <size>142,68d</size>
+ <pos>6,132d</pos> <size>142,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxButton" name="wxID_OK">
@@ -100,14 +100,14 @@
<label>List Files of &Type:</label>
</object>
<object class="wxComboBox" name="ID_STATICDECIMAL_1136">
- <pos>6,132d</pos> <size>90,36d</size>
+ <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">
- <pos>6,132d</pos> <size>142,68d</size>
+ <pos>6,132d</pos> <size>142,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxButton" name="wxID_OK">
Index: Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 815)
@@ -28,10 +28,10 @@
<label>Spread</label>
</object>
<object class="wxComboBox" name="IDC_ALIGNDIALOG_HORIZONTAL">
- <pos>4,133d</pos> <size>105,30d</size>
+ <pos>4,133d</pos> <size>105,-1d</size>
</object>
<object class="wxComboBox" name="IDC_ALIGNDIALOG_VERTICAL">
- <pos>4,158d</pos> <size>105,30d</size>
+ <pos>4,158d</pos> <size>105,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>4,123d</pos> <size>72,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 815)
@@ -168,7 +168,7 @@
<pos>115,106d</pos> <size>25,13d</size>
</object>
<object class="wxComboBox" name="IDC_FILLQUALLIST">
- <pos>48,145d</pos> <size>48,38d</size>
+ <pos>48,145d</pos> <size>48,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_GROUP_PRINTLAYERS">
<pos>5,19d</pos> <size>195,30d</size>
@@ -330,7 +330,7 @@
<label>Print &Quality:</label>
</object>
<object class="wxComboBox" name="cmb1">
- <pos>55,-1094d</pos> <size>81,36d</size>
+ <pos>55,-1094d</pos> <size>81,-1d</size>
</object>
<object class="wxStaticText" name="stc5">
<pos>5,112d</pos> <size>25,9d</size>
@@ -361,7 +361,7 @@
<object class="wxDialog" name="IDD_XSEPSOPS">
<pos>0,0d</pos> <size>194,74d</size>
<object class="wxComboBox" name="IDC_DPIEDIT">
- <pos>10,23d</pos> <size>35,40d</size>
+ <pos>10,23d</pos> <size>35,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxCheckBox" name="IDC_EXPORTTEXTASCURVES">
@@ -405,15 +405,15 @@
<label> </label>
</object>
<object class="wxComboBox" name="IDC_COMBORESOLUTION">
- <pos>110,43d</pos> <size>62,100d</size>
+ <pos>110,43d</pos> <size>62,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxComboBox" name="IDC_COMBOFREQUENCY">
- <pos>110,59d</pos> <size>62,100d</size>
+ <pos>110,59d</pos> <size>62,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxComboBox" name="IDC_COMBOTYPE">
- <pos>110,75d</pos> <size>84,100d</size>
+ <pos>110,75d</pos> <size>84,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxCheckBox" name="IDC_CHECKSEPARATIONS">
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 815)
@@ -22,7 +22,7 @@
<label>File Difference:</label>
</object>
<object class="wxComboBox" name="IDC_FILE_TYPE_LIST">
- <pos>121,0d</pos> <size>48,30d</size>
+ <pos>121,0d</pos> <size>48,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_ACTIVE2">
<pos>213,0d</pos> <size>165,151d</size>
@@ -44,7 +44,7 @@
<label>File Difference:</label>
</object>
<object class="wxComboBox" name="IDC_FILE_TYPE_LIST2">
- <pos>326,0d</pos> <size>48,30d</size>
+ <pos>326,0d</pos> <size>48,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_ZOOM_TOOL">
<pos>183,6d</pos> <size>20,20d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 815)
@@ -19,10 +19,10 @@
<label>Check List Box Placeholder</label>
</object>
<object class="wxComboBox" name="IDC_ES_COMBO_XBEHAVIOUR">
- <pos>6,155d</pos> <size>75,48d</size>
+ <pos>6,155d</pos> <size>75,-1d</size>
</object>
<object class="wxComboBox" name="IDC_ES_COMBO_YBEHAVIOUR">
- <pos>92,155d</pos> <size>78,48d</size>
+ <pos>92,155d</pos> <size>78,-1d</size>
</object>
<object class="wxStaticText" name="IDC_ES_HORIZONTAL">
<pos>6,145d</pos> <size>37,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 815)
@@ -27,7 +27,7 @@
<label>&dpi</label>
</object>
<object class="wxComboBox" name="IDC_BMPOPTS_RES">
- <pos>50,35d</pos> <size>70,15d</size>
+ <pos>50,35d</pos> <size>70,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>55,50d</pos> <size>45,10d</size>
@@ -104,7 +104,7 @@
<label>RGB</label>
</object>
<object class="wxComboBox" name="IDC_BMPOPTS_TIFF">
- <pos>165,99d</pos> <size>70,15d</size>
+ <pos>165,99d</pos> <size>70,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
<pos>220,10d</pos> <size>50,14d</size>
@@ -189,7 +189,7 @@
<label>times</label>
</object>
<object class="wxComboBox" name="IDC_ANIMOPTS_REMOVAL">
- <pos>55,180d</pos> <size>67,51d</size>
+ <pos>55,180d</pos> <size>67,-1d</size>
</object>
<object class="wxStaticText" name="IDC_RESTORE_STATIC">
<pos>21,178d</pos> <size>30,10d</size>
@@ -243,7 +243,7 @@
<label>&dpi</label>
</object>
<object class="wxComboBox" name="IDC_BMPOPTS_RES">
- <pos>50,35d</pos> <size>70,15d</size>
+ <pos>50,35d</pos> <size>70,-1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>55,50d</pos> <size>45,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 815)
@@ -3,11 +3,11 @@
<object class="wxDialog" name="IDD_EXPORT_IMAGEMAP">
<pos>0,0d</pos> <size>188,165d</size>
<object class="wxComboBox" name="IDC_IMAGEMAP_MAPNAME">
- <pos>45,7d</pos> <size>135,14d</size>
+ <pos>45,7d</pos> <size>135,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxComboBox" name="IDC_IMAGEMAP_APPROX">
- <pos>106,26d</pos> <size>75,24d</size>
+ <pos>106,26d</pos> <size>75,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_IMAGEMAP_WIDTH">
<pos>47,55d</pos> <size>30,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 815)
@@ -6,7 +6,7 @@
<pos>70,114d</pos> <size>34,12d</size>
</object>
<object class="wxComboBox" name="IDC_SETREMOVAL">
- <pos>70,134d</pos> <size>68,14d</size>
+ <pos>70,134d</pos> <size>68,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
<pos>14,181d</pos> <size>43,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 815)
@@ -3,7 +3,7 @@
<object class="wxDialog" name="IDD_COLOUREDITDLG">
<pos>0,0d</pos> <size>143,241d</size>
<object class="wxComboBox" name="IDC_EDIT_NAMEMENU">
- <pos>4,4d</pos> <size>85,160d</size>
+ <pos>4,4d</pos> <size>85,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_LINEFILL">
<pos>107,400d</pos> <size>18,14d</size>
@@ -30,17 +30,17 @@
<pos>96,128d</pos> <size>20,12d</size>
</object>
<object class="wxComboBox" name="IDC_EDIT_COLMODEL">
- <pos>400,147d</pos> <size>104,60d</size>
+ <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">
- <pos>3,165d</pos> <size>135,48d</size>
+ <pos>3,165d</pos> <size>135,-1d</size>
</object>
<object class="wxComboBox" name="IDC_EDIT_PARENTCOL">
- <pos>36,183d</pos> <size>103,160d</size>
+ <pos>36,183d</pos> <size>103,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_TINT">
<pos>35,201d</pos> <size>20,13d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 815)
@@ -382,16 +382,16 @@
<label>-</label>
</object>
<object class="wxComboBox" name="IDCB_ZOOM_COMBO_BOX">
- <pos>291,12d</pos> <size>36,105d</size>
+ <pos>291,12d</pos> <size>36,-1d</size>
</object>
<object class="wxComboBox" name="IDCB_LINEWIDTH_COMBO_BOX">
- <pos>258,12d</pos> <size>32,78d</size>
+ <pos>258,12d</pos> <size>32,-1d</size>
</object>
<object class="wxComboBox" name="IDLB_JOINTYPE_LIST_BOX">
- <pos>300,12d</pos> <size>46,48d</size>
+ <pos>300,12d</pos> <size>46,-1d</size>
</object>
<object class="wxComboBox" name="IDLB_LINECAP_LIST_BOX">
- <pos>300,12d</pos> <size>43,48d</size>
+ <pos>300,12d</pos> <size>43,-1d</size>
</object>
<title>Dummy standard bar</title>
</object>
@@ -402,16 +402,16 @@
<object class="wxDialog" name="IDD_GRIDDLG">
<pos>0,0d</pos> <size>329,21d</size>
<object class="wxComboBox" name="IDC_UNITS">
- <pos>63,4d</pos> <size>54,89d</size>
+ <pos>63,4d</pos> <size>54,-1d</size>
</object>
<object class="wxComboBox" name="IDC_GRIDTYPE">
- <pos>183,4d</pos> <size>54,30d</size>
+ <pos>183,4d</pos> <size>54,-1d</size>
</object>
<object class="wxComboBox" name="IDC_DIVISIONS">
- <pos>6,4d</pos> <size>48,96d</size>
+ <pos>6,4d</pos> <size>48,-1d</size>
</object>
<object class="wxComboBox" name="IDC_SUBDIVISIONS">
- <pos>126,4d</pos> <size>48,96d</size>
+ <pos>126,4d</pos> <size>48,-1d</size>
</object>
<object class="wxButton" name="IDC_MAKEGRID">
<pos>245,5d</pos> <size>10,10d</size>
@@ -422,16 +422,16 @@
<object class="wxDialog" name="IDD_GRIDTOOL">
<pos>0,0d</pos> <size>394,22d</size>
<object class="wxComboBox" name="IDC_DIVISIONS">
- <pos>5,5d</pos> <size>36,97d</size>
+ <pos>5,5d</pos> <size>36,-1d</size>
</object>
<object class="wxComboBox" name="IDC_UNITS">
- <pos>46,5d</pos> <size>54,89d</size>
+ <pos>46,5d</pos> <size>54,-1d</size>
</object>
<object class="wxComboBox" name="IDC_SUBDIVISIONS">
- <pos>105,5d</pos> <size>36,98d</size>
+ <pos>105,5d</pos> <size>36,-1d</size>
</object>
<object class="wxComboBox" name="IDC_GRIDTYPE">
- <pos>146,5d</pos> <size>54,30d</size>
+ <pos>146,5d</pos> <size>54,-1d</size>
</object>
<title></title>
</object>
@@ -540,7 +540,7 @@
<object class="wxDialog" name="IDD_INFOBAR">
<pos>0,0d</pos> <size>122,19d</size>
<object class="wxComboBox" name="IDC_LAYER_COMBO">
- <pos>10,3d</pos> <size>88,56d</size>
+ <pos>10,3d</pos> <size>88,-1d</size>
</object>
<object class="wxButton" name="IDC_INVOKE_LYR_DLG">
<pos>101,3d</pos> <size>12,12d</size>
@@ -651,10 +651,10 @@
<label>Spacing:</label>
</object>
<object class="wxComboBox" name="IDC_BRUSHTYPE">
- <pos>175,15d</pos> <size>28,11d</size>
+ <pos>175,15d</pos> <size>28,-1d</size>
</object>
<object class="wxComboBox" name="IDC_STROKETYPE">
- <pos>175,15d</pos> <size>28,11d</size>
+ <pos>175,15d</pos> <size>28,-1d</size>
</object>
<title></title>
</object>
@@ -673,7 +673,7 @@
<style>wxSP_VERTICAL</style>
</object>
<object class="wxComboBox" name="IDC_COMBOBOX_LE_ORDER2">
- <pos>5,5d</pos> <size>85,30d</size>
+ <pos>5,5d</pos> <size>85,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxStaticText" name="IDC_STATIC_LE_CHANGEINSERT">
@@ -681,7 +681,7 @@
<label>Change/Insert</label>
</object>
<object class="wxComboBox" name="IDC_COMBOBOX_LE_TYPE2">
- <pos>5,60d</pos> <size>85,30d</size>
+ <pos>5,60d</pos> <size>85,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxButton" name="IDC_BUTTON_LE_EDIT">
@@ -697,10 +697,10 @@
<label>Remove All</label>
</object>
<object class="wxComboBox" name="IDC_COMBOBOX_LE_TYPE">
- <pos>100,60d</pos> <size>70,30d</size>
+ <pos>100,60d</pos> <size>70,-1d</size>
</object>
<object class="wxComboBox" name="IDC_COMBOBOX_LE_ORDER">
- <pos>100,5d</pos> <size>100,30d</size>
+ <pos>100,5d</pos> <size>100,-1d</size>
</object>
<object class="wxButton" name="IDC_BUTTON_LE_ADD">
<pos>55,80d</pos> <size>25,14d</size>
@@ -747,7 +747,7 @@
<label>Setup...</label>
</object>
<object class="wxComboBox" name="IDC_COMBOBOX_LE_RES">
- <pos>205,60d</pos> <size>40,30d</size>
+ <pos>205,60d</pos> <size>40,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_CCBUTTON_LE_TOGGLELOCK">
<pos>155,25d</pos> <size>17,15d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 815)
@@ -7,7 +7,7 @@
<label>Add:</label>
</object>
<object class="wxComboBox" name="IDC_EDIT_REGSHAPETOOL_SIDES">
- <pos>147,73d</pos> <size>27,84d</size>
+ <pos>147,73d</pos> <size>27,-1d</size>
</object>
<object class="wxCamArtControl" name="IDC_BTN_REGSHAPETOOL_RADIUS">
<pos>4,48d</pos> <size>16,16d</size>
@@ -38,7 +38,7 @@
<label>-</label>
</object>
<object class="wxComboBox" name="IDC_EDIT_REGSHAPETOOL_POS">
- <pos>73,13d</pos> <size>68,75d</size>
+ <pos>73,13d</pos> <size>68,-1d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_REGSHAPETOOL_UPPER">
<pos>13,73d</pos> <size>25,12d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 815)
@@ -259,10 +259,10 @@
<label>Export</label>
</object>
<object class="wxComboBox" name="IDC_NAMEGAL_PROP_IDX">
- <pos>116,92d</pos> <size>36,64d</size>
+ <pos>116,92d</pos> <size>36,-1d</size>
</object>
<object class="wxComboBox" name="IDC_LIBGAL_CLIPTHEME">
- <pos>116,92d</pos> <size>45,64d</size>
+ <pos>116,92d</pos> <size>45,-1d</size>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>4,80d</pos> <size>152,28d</size>
@@ -289,7 +289,7 @@
<object class="wxDialog" name="IDD_SGDISPLAY">
<pos>0,0d</pos> <size>146,39d</size>
<object class="wxComboBox" name="IDC_SGDISPLAY_DMODE">
- <pos>4,5d</pos> <size>139,63d</size>
+ <pos>4,5d</pos> <size>139,-1d</size>
</object>
<object class="wxButton" name="wxID_OK">
<pos>3,23d</pos> <size>43,14d</size>
@@ -361,14 +361,14 @@
<object class="wxDialog" name="IDD_SGSORT">
<pos>0,0d</pos> <size>227,73d</size>
<object class="wxComboBox" name="IDC_GALSORT_SORT1">
- <pos>7,17d</pos> <size>76,44d</size>
+ <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">
- <pos>95,17d</pos> <size>76,44d</size>
+ <pos>95,17d</pos> <size>76,-1d</size>
</object>
<object class="wxCheckBox" name="IDC_GALSORT_REVERSE2">
<pos>111,33d</pos> <size>44,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 815)
@@ -10,7 +10,7 @@
<label>Correct URL automatically</label>
</object>
<object class="wxComboBox" name="IDC_WEBADDRESS_FRAME">
- <pos>7,53d</pos> <size>218,17d</size>
+ <pos>7,53d</pos> <size>218,-1d</size>
<style>wxCB_SORT</style>
</object>
<object class="wxRadioButton" name="IDC_WEBADDRESS_OBJECTSHAPE">
Index: Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 814)
+++ Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 815)
@@ -29,7 +29,7 @@
<label>Group</label>
</object>
<object class="wxComboBox" name="IDC_DEBUGDLG_GROUP">
- <pos>40,5d</pos> <size>130,279d</size>
+ <pos>40,5d</pos> <size>130,-1d</size>
</object>
<title>Camelot debug commands</title>
</object>
Xara