[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1419
Date : Thu Jul 6 23:01: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/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-sizer.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/xtendres.xrc
Fix enter-processing in dialogs
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 1418)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 1419)
@@ -616,6 +616,7 @@
AddStyle ("wxCB_SORT",\$style) if ($token =~ /CBS_SORT/);
AddStyle ("wxCB_ALWAYS_SB",\$style) if ($token =~ /CBS_DISABLENOSCROLL/);
AddStyle ("wxCB_READONLY",\$style) if ($token =~ /CBS_DROPDOWNLIST/);
+ AddStyle ("wxTE_PROCESS_ENTER",\$style);
WriteStyle($style);
print OUTPUT " </object>
";
}
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 1419)
@@ -39,7 +39,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<title>Flip & Rotate</title>
<label>Flip & Rotate</label>
@@ -70,7 +70,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_DPI2">
<pos>59,109d</pos> <size>49,8d</size>
@@ -115,7 +115,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxSlider" name="IDC_BFXDLG_BRIGHTNESS">
<pos>67,98d</pos> <size>102,14d</size>
@@ -162,7 +162,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_BAYERMONO">
<pos>4,103d</pos> <size>82,10d</size>
@@ -216,11 +216,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
<pos>5,98d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
<pos>99,83d</pos> <size>68,59d</size>
@@ -282,7 +282,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxSlider" name="IDC_BFXDLG_ALC_SATURATION_SLIDER">
<pos>54,112d</pos> <size>28,14d</size>
@@ -503,7 +503,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
@@ -642,7 +642,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
<pos>5,98d</pos> <size>77,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
<pos>99,83d</pos> <size>68,59d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 1419)
@@ -29,7 +29,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GUIDETAB_COLOURLIST">
<pos>55,119d</pos> <size>70,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_GUIDETAB_COLOURTEXT">
<pos>25,121d</pos> <size>25,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 1419)
@@ -85,7 +85,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_MUTATE_COLOURS">
<pos>110,7d</pos> <size>98,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="IDC_DELETE_STATE">
<pos>110,40d</pos> <size>50,14d</size>
@@ -135,7 +135,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BAR_NO_COMBO">
<pos>92,18d</pos> <size>60,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<title>Set button design in this State</title>
<label>Set button design in this State</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/simon.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 1419)
@@ -15,7 +15,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BC_DIRECTION">
<pos>72,21d</pos> <size>79,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>7,38d</pos> <size>60,8d</size>
@@ -30,7 +30,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BC_BUTTON_SIZE">
<pos>72,52d</pos> <size>79,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>7,69d</pos> <size>56,8d</size>
@@ -38,7 +38,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BC_BUTTONS_SAME">
<pos>72,67d</pos> <size>79,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 1419)
@@ -52,18 +52,18 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_SLIDER_COMBO">
<pos>75,1d</pos> <size>60,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_TYPE_COMBO">
<pos>9,2d</pos> <size>60,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxTextCtrl" name="IDC_BEVEL_SLIDER_EDIT">
<pos>215,2d</pos> <size>35,12d</size>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_INNER_COMBO">
<pos>260,1d</pos> <size>60,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 1419)
@@ -63,11 +63,11 @@
<pos>0,0d</pos> <size>160,100d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_TCOMBO3">
<pos>16,22d</pos> <size>56,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_TCOMBO4">
<pos>85,22d</pos> <size>48,-1d</size>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_TSTDEF">
<pos>16,11d</pos> <size>30,8d</size>
@@ -204,11 +204,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBO3">
<pos>20,182d</pos> <size>56,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBO4">
<pos>89,182d</pos> <size>48,-1d</size>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticBox" name="IDC_STCONV">
<pos>4,160d</pos> <size>233,86d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 1419)
@@ -109,11 +109,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_TRACER_BITMAP">
<pos>2,131d</pos> <size>124,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_TRACER_METHOD">
<pos>2,149d</pos> <size>124,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 1419)
@@ -50,7 +50,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BIASGAINCOMBO">
<pos>7,7d</pos> <size>24,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 1419)
@@ -4,7 +4,7 @@
<pos>0,0d</pos> <size>329,171d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_FONT_COMBO">
<pos>56,10d</pos> <size>68,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_POINT_COMBO">
<pos>135,10d</pos> <size>28,-1d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc (revision 1419)
@@ -356,7 +356,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_IMAPTAB_MAPNAME">
<size>183,-1</size>
<pos>295,42</pos>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -374,7 +374,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_IMAPTAB_APPROX">
<size>183,-1</size>
<pos>295,86</pos>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -580,7 +580,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_DITHERING_COMBO">
<pos>52,7d</pos> <size>83,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC2">
<pos>7,24d</pos> <size>29,9d</size>
@@ -588,7 +588,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_PALETTE_COMBO">
<pos>52,23d</pos> <size>83,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC3">
<pos>7,40d</pos> <size>42,9d</size>
@@ -596,7 +596,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COLOUR_DEPTH_COMBO">
<pos>52,38d</pos> <size>83,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC4">
<pos>7,56d</pos> <size>43,9d</size>
@@ -607,7 +607,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COLOR_MODEL_LIST">
<pos>80,54d</pos> <size>55,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC6">
<pos>7,72d</pos> <size>20,9d</size>
@@ -671,7 +671,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_T2_SORT_LIST">
<pos>296,71d</pos> <size>68,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<title>Palette Options</title>
<label>Palette Options</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 1419)
@@ -15,7 +15,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_NEWCOL_COLLIST">
<pos>4,36d</pos> <size>124,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 1419)
@@ -21,7 +21,7 @@
</font>
<size>80,-1</size>
<buttonsize>17,-1</buttonsize>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -236,7 +236,7 @@
</font>
<size>80,-1</size>
<buttonsize>17,-1</buttonsize>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -324,7 +324,7 @@
</font>
<size>80,-1</size>
<buttonsize>17,-1</buttonsize>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
@@ -354,7 +354,7 @@
</font>
<size>80,-1</size>
<buttonsize>17,-1</buttonsize>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1419)
@@ -35,7 +35,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1136">
<pos>6,132d</pos> <size>140,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="ID_STATICDECIMAL_1091">
<pos>6,122d</pos> <size>142,9d</size>
@@ -43,7 +43,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1137">
<pos>6,132d</pos> <size>142,-1d</size>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>154,26d</pos> <size>50,14d</size>
@@ -103,7 +103,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1136">
<pos>6,132d</pos> <size>90,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="ID_STATICDECIMAL_1091">
<pos>6,122d</pos> <size>142,9d</size>
@@ -111,7 +111,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1137">
<pos>6,132d</pos> <size>142,-1d</size>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>154,26d</pos> <size>50,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 1419)
@@ -29,11 +29,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ALIGNDIALOG_HORIZONTAL">
<pos>4,133d</pos> <size>105,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ALIGNDIALOG_VERTICAL">
<pos>4,158d</pos> <size>105,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 1419)
@@ -180,7 +180,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_FILLQUALLIST">
<pos>48,145d</pos> <size>48,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
<content>
<item>High</item>
<item>Normal</item>
@@ -379,7 +379,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="cmb1">
<pos>55,-1094d</pos> <size>81,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="stc5">
<pos>5,112d</pos> <size>25,9d</size>
@@ -417,7 +417,7 @@
<pos>0,0d</pos> <size>194,74d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_DPIEDIT">
<pos>10,23d</pos> <size>35,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxCheckBox" name="IDC_EXPORTTEXTASCURVES">
<pos>10,52d</pos> <size>80,10d</size>
@@ -462,15 +462,15 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBORESOLUTION">
<pos>110,43d</pos> <size>62,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBOFREQUENCY">
<pos>110,59d</pos> <size>62,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBOTYPE">
<pos>110,75d</pos> <size>84,-1d</size>
- <style>wxCB_SORT|wxCB_READONLY</style>
+ <style>wxCB_SORT|wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxCheckBox" name="IDC_CHECKSEPARATIONS">
<pos>11,95d</pos> <size>89,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 1419)
@@ -23,7 +23,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_FILE_TYPE_LIST">
<pos>121,0d</pos> <size>48,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticBox" name="IDC_ACTIVE2">
<pos>213,0d</pos> <size>165,151d</size>
@@ -46,7 +46,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_FILE_TYPE_LIST2">
<pos>326,0d</pos> <size>48,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 1419)
@@ -20,11 +20,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ES_COMBO_XBEHAVIOUR">
<pos>6,155d</pos> <size>75,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ES_COMBO_YBEHAVIOUR">
<pos>92,155d</pos> <size>78,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 1419)
@@ -108,7 +108,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BMPOPTS_TIFF">
<pos>165,99d</pos> <size>70,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>220,10d</pos> <size>50,14d</size>
@@ -196,7 +196,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ANIMOPTS_REMOVAL">
<pos>55,180d</pos> <size>67,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_RESTORE_STATIC">
<pos>21,178d</pos> <size>30,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg-sizer.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg-sizer.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg-sizer.xrc (revision 1419)
@@ -140,7 +140,7 @@
<border>5</border>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_COLOURBAR">
<pos>129,175</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -156,7 +156,7 @@
<border>5</border>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_AUTOCOLOUR">
<pos>129,203</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
@@ -320,7 +320,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_IMPWITHLAYERS">
<size>250,-1</size>
<pos>105,186</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
@@ -355,6 +355,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_ANGLECONST">
<size>60,-1</size>
<pos>105,237</pos>
+ <style>wxCB_DROPDOWN|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -469,7 +470,7 @@
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_SIZELIST">
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -1034,7 +1035,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_LEFTBUTTON">
<size>172,-1</size>
<pos>120,48</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -1052,7 +1053,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_RIGHTBUTTON">
<size>172,-1</size>
<pos>120,82</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
@@ -1322,7 +1323,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_PAGEUNITS">
<size>121,-1</size>
<pos>76,48</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -1340,7 +1341,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_FONTUNITS">
<size>121,-1</size>
<pos>76,76</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
@@ -1564,7 +1565,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_BASEUNIT">
<size>150,-1</size>
<pos>82,146</pos>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
@@ -1678,6 +1679,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_COMBO_LIVEEFFECT_RES">
<size>123,-1</size>
<pos>169,113</pos>
+ <style>wxCB_DROPDOWN|wxTE_PROCESS_ENTER</style>
</object>
</object>
<object class="sizeritem">
@@ -1695,6 +1697,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_COMBO_LOCKEDEFFECT_RES">
<size>123,-1</size>
<pos>169,141</pos>
+ <style>wxCB_DROPDOWN|wxTE_PROCESS_ENTER</style>
</object>
</object>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 1419)
@@ -4,11 +4,11 @@
<pos>0,0d</pos> <size>188,165d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_IMAGEMAP_MAPNAME">
<pos>45,7d</pos> <size>135,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_IMAGEMAP_APPROX">
<pos>106,26d</pos> <size>75,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 1419)
@@ -7,7 +7,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_SETREMOVAL">
<pos>70,134d</pos> <size>68,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 1419)
@@ -4,7 +4,7 @@
<pos>0,0d</pos> <size>143,241d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_NAMEMENU">
<pos>4,4d</pos> <size>85,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_LINEFILL">
<pos>107,400d</pos> <size>18,14d</size>
@@ -52,7 +52,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
<pos>400,147d</pos> <size>104,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxCheckBox" name="IDC_EDIT_3D">
<pos>11200,147d</pos> <size>24,12d</size>
@@ -60,11 +60,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
<pos>3,165d</pos> <size>135,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
<pos>36,183d</pos> <size>103,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 1419)
@@ -405,11 +405,11 @@
<pos>0,0d</pos> <size>329,21d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_UNITS">
<pos>63,4d</pos> <size>54,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GRIDTYPE">
<pos>183,4d</pos> <size>54,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_DIVISIONS">
<pos>6,4d</pos> <size>48,-1d</size>
@@ -431,14 +431,14 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_UNITS">
<pos>46,5d</pos> <size>54,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_SUBDIVISIONS">
<pos>105,5d</pos> <size>36,-1d</size>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GRIDTYPE">
<pos>146,5d</pos> <size>54,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<title></title>
<label></label>
@@ -552,7 +552,7 @@
<pos>0,0d</pos> <size>122,19d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_LAYER_COMBO">
<pos>10,3d</pos> <size>88,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="IDC_INVOKE_LYR_DLG">
<pos>101,3d</pos> <size>12,12d</size>
@@ -701,7 +701,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_ORDER2">
<pos>5,5d</pos> <size>85,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticText" name="IDC_STATIC_LE_CHANGEINSERT">
<pos>10,45d</pos> <size>50,8d</size>
@@ -709,7 +709,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COMBOBOX_LE_TYPE2">
<pos>5,60d</pos> <size>85,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="IDC_BUTTON_LE_EDIT">
<pos>5,80d</pos> <size>25,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 1419)
@@ -39,7 +39,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_REGSHAPETOOL_POS">
<pos>73,13d</pos> <size>68,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 1419)
@@ -260,11 +260,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_NAMEGAL_PROP_IDX">
<pos>116,92d</pos> <size>36,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_LIBGAL_CLIPTHEME">
<pos>116,92d</pos> <size>45,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>4,80d</pos> <size>152,28d</size>
@@ -293,7 +293,7 @@
<pos>0,0d</pos> <size>146,39d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_SGDISPLAY_DMODE">
<pos>4,5d</pos> <size>139,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>3,23d</pos> <size>43,14d</size>
@@ -375,7 +375,7 @@
<pos>0,0d</pos> <size>227,73d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_GALSORT_SORT1">
<pos>7,17d</pos> <size>76,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxCheckBox" name="IDC_GALSORT_REVERSE1">
<pos>23,33d</pos> <size>44,10d</size>
@@ -383,7 +383,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GALSORT_SORT2">
<pos>95,17d</pos> <size>76,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</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 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 1419)
@@ -11,7 +11,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_WEBADDRESS_FRAME">
<pos>7,53d</pos> <size>218,-1d</size>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxTE_PROCESS_ENTER</style>
</object>
<object class="wxRadioButton" name="IDC_WEBADDRESS_OBJECTSHAPE">
<pos>18,83d</pos> <size>79,11d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 1418)
+++ Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 1419)
@@ -35,7 +35,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_DEBUGDLG_GROUP">
<pos>40,5d</pos> <size>130,-1d</size>
- <style>wxCB_READONLY</style>
+ <style>wxCB_READONLY|wxTE_PROCESS_ENTER</style>
</object>
<title>Camelot debug commands</title>
<label>Camelot debug commands</label>
Xara