[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1044
Date : Mon May 15 11:26:23 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/barconverter
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/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/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/xaralx-bars.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
M /Trunk/XaraLX/wxXtra/odcombo.cpp
Make comboboxes readonly when they should be readonly
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 1043)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 1044)
@@ -602,6 +602,7 @@
WriteStyle ("wxCB_SIMPLE") if ($token =~ /CBS_SIMPLE/);
WriteStyle ("wxCB_SORT") if ($token =~ /CBS_SORT/);
WriteStyle ("wxCB_ALWAYS_SB") if ($token =~ /CBS_DISABLENOSCROLL/);
+ WriteStyle ("wxCB_READONLY") if ($token =~ /CBS_DROPDOWNLIST/);
print OUTPUT " </object>
";
}
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter (revision 1043)
+++ Trunk/XaraLX/Scripts/barconverter (revision 1044)
@@ -150,6 +150,32 @@
return $cnamemap{ $control } || $default;
}
+sub GetComboStyle
+{
+ my $control = shift @_;
+ my $default = "wxCB_DROPDOWN";
+
+ my %cnamemap = (
+ "IDC_NAMEGAL_PROP_IDX" => "wxCB_READONLY",
+ "IDC_EDIT_REGSHAPETOOL_POS" => "wxCB_READONLY",
+ "IDC_GEOMETRY" => "wxCB_READONLY",
+ "IDC_MAPPING" => "wxCB_READONLY",
+ "IDC_EFFECT" => "wxCB_READONLY",
+ "IDC_BITMAPEFFECT" => "wxCB_READONLY",
+ "IDC_GEOMETRY" => "wxCB_READONLY",
+ "IDC_TRANSPTYPE" => "wxCB_READONLY",
+ "IDC_MAPPING" => "wxCB_READONLY",
+ "IDC_BITMAPEFFECT" => "wxCB_READONLY",
+ "IDC_BRUSHTYPE" => "wxCB_READONLY",
+ "IDC_STROKETYPE" => "wxCB_READONLY",
+ "IDC_EFFECT" => "wxCB_READONLY",
+ "IDC_BEVEL_TYPE_COMBO" => "wxCB_READONLY",
+ "IDC_BEVEL_SLIDER_COMBO" => "wxCB_READONLY",
+ "IDC_FONT_COMBO" => "wxCB_READONLY",
+ );
+ return $cnamemap{ $control } || $default;
+}
+
sub GetText
{
my $n = shift @_;
@@ -301,7 +327,7 @@
print STDOUT $ddindent." <object class=\"wxOwnerDrawnComboBox\" name=\"$name\">
";
printf STDOUT $ddindent." <size>%d,-1</size>
",GetSize($name, 80);
WriteFont();
- print STDOUT $ddindent." <style>wxCB_DROPDOWN</style>
";
+ printf STDOUT $ddindent." <style>%s</style>
", GetComboStyle($name);
ConvertOptoken($optoken) if ($optoken ne "");
BubbleHelp();
print STDOUT $ddindent." </object>
";
Index: Trunk/XaraLX/wxXtra/odcombo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/odcombo.cpp (revision 1043)
+++ Trunk/XaraLX/wxXtra/odcombo.cpp (revision 1044)
@@ -688,7 +688,8 @@
m_popupInterface->Clear();
- GetTextCtrl()->SetValue(wxEmptyString);
+ if (GetTextCtrl())
+ GetTextCtrl()->SetValue(wxEmptyString);
}
void wxOwnerDrawnComboBox::Delete(int n)
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 1044)
@@ -39,6 +39,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<title>Flip & Rotate</title>
<label>Flip & Rotate</label>
@@ -69,6 +70,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_DPI2">
<pos>59,109d</pos> <size>49,8d</size>
@@ -113,6 +115,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxSlider" name="IDC_BFXDLG_BRIGHTNESS">
<pos>67,98d</pos> <size>102,14d</size>
@@ -159,6 +162,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_BAYERMONO">
<pos>4,103d</pos> <size>82,10d</size>
@@ -212,9 +216,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
<pos>5,98d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticBox" name="IDC_BFXDLG_GRPCUSTOM">
<pos>99,83d</pos> <size>68,59d</size>
@@ -276,6 +282,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxSlider" name="IDC_BFXDLG_ALC_SATURATION_SLIDER">
<pos>54,112d</pos> <size>28,14d</size>
@@ -496,6 +503,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_ORIGCOMBO">
<pos>5,81d</pos> <size>37,-1d</size>
@@ -634,6 +642,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BFXDLG_EFFECTCOMBO">
<pos>5,98d</pos> <size>77,-1d</size>
+ <style>wxCB_READONLY</style>
</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 1044)
@@ -45,6 +45,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_COLOURBAR">
<pos>86,108d</pos> <size>105,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_OPTS_AUTOCOLOURTXT">
<pos>11,127d</pos> <size>65,10d</size>
@@ -52,6 +53,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_AUTOCOLOUR">
<pos>86,125d</pos> <size>105,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxCheckBox" name="IDC_OPTS_AUTOSCROLL">
<pos>11,141d</pos> <size>125,10d</size>
@@ -122,6 +124,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_IMPWITHLAYERS">
<pos>70,115d</pos> <size>125,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticBox" name="IDC_OPTS_EDITGRP">
<pos>5,136d</pos> <size>195,49d</size>
@@ -182,6 +185,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_SIZELIST">
<pos>60,27d</pos> <size>136,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_OPTS_WIDTHTXT">
<pos>37,48d</pos> <size>20,10d</size>
@@ -372,6 +376,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_LEFTBUTTON">
<pos>80,30d</pos> <size>115,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_OPTS_RIGHTTXT">
<pos>11,53d</pos> <size>65,10d</size>
@@ -379,6 +384,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_RIGHTBUTTON">
<pos>80,51d</pos> <size>115,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxButton" name="IDC_OPTS_RESET">
<pos>120,72d</pos> <size>75,15d</size>
@@ -479,6 +485,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_PAGEUNITS">
<pos>51,30d</pos> <size>81,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_OPTS_FONTUNITSTXT">
<pos>11,47d</pos> <size>35,9d</size>
@@ -486,6 +493,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_FONTUNITS">
<pos>51,47d</pos> <size>81,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticBox" name="IDC_OPTS_USERUNITSGROUP">
<pos>5,75d</pos> <size>195,105d</size>
@@ -568,6 +576,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_OPTS_BASEUNIT">
<pos>55,90d</pos> <size>85,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>180,10d</pos> <size>50,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 1044)
@@ -29,6 +29,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GUIDETAB_COLOURLIST">
<pos>55,119d</pos> <size>70,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 1044)
@@ -85,6 +85,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_MUTATE_COLOURS">
<pos>110,7d</pos> <size>98,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxButton" name="IDC_DELETE_STATE">
<pos>110,40d</pos> <size>50,14d</size>
@@ -129,6 +130,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BAR_NO_COMBO">
<pos>92,18d</pos> <size>60,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 1044)
@@ -15,6 +15,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BC_DIRECTION">
<pos>72,21d</pos> <size>79,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>7,38d</pos> <size>60,8d</size>
@@ -29,6 +30,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BC_BUTTON_SIZE">
<pos>72,52d</pos> <size>79,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_STATIC">
<pos>7,69d</pos> <size>56,8d</size>
@@ -36,6 +38,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BC_BUTTONS_SAME">
<pos>72,67d</pos> <size>79,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 1044)
@@ -52,15 +52,18 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_SLIDER_COMBO">
<pos>75,1d</pos> <size>60,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BEVEL_TYPE_COMBO">
<pos>9,2d</pos> <size>60,-1d</size>
+ <style>wxCB_READONLY</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>
</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 1044)
@@ -68,6 +68,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_TCOMBO4">
<pos>85,22d</pos> <size>48,-1d</size>
<style>wxCB_SORT</style>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_TSTDEF">
<pos>16,11d</pos> <size>30,8d</size>
@@ -209,6 +210,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_COMBO4">
<pos>89,182d</pos> <size>48,-1d</size>
<style>wxCB_SORT</style>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 1044)
@@ -109,9 +109,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_TRACER_BITMAP">
<pos>2,131d</pos> <size>124,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_TRACER_METHOD">
<pos>2,149d</pos> <size>124,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_TRACER_3DFRAMEP2">
<pos>135,131d</pos> <size>124,11d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/textres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 1044)
@@ -4,6 +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>
</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev-sizer.xrc (revision 1044)
@@ -354,7 +354,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_IMAPTAB_MAPNAME">
<size>183,-1</size>
<pos>295,42</pos>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxCB_READONLY</style>
</object>
</object>
<object class="sizeritem">
@@ -372,7 +372,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_IMAPTAB_APPROX">
<size>183,-1</size>
<pos>295,86</pos>
- <style>wxCB_SORT</style>
+ <style>wxCB_SORT|wxCB_READONLY</style>
</object>
</object>
<object class="sizeritem">
@@ -578,6 +578,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_DITHERING_COMBO">
<pos>52,7d</pos> <size>83,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC2">
<pos>7,24d</pos> <size>29,9d</size>
@@ -585,6 +586,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_PALETTE_COMBO">
<pos>52,23d</pos> <size>83,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC3">
<pos>7,40d</pos> <size>42,9d</size>
@@ -592,6 +594,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COLOUR_DEPTH_COMBO">
<pos>52,38d</pos> <size>83,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC4">
<pos>7,56d</pos> <size>43,9d</size>
@@ -602,6 +605,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_COLOR_MODEL_LIST">
<pos>80,54d</pos> <size>55,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_T2STATIC6">
<pos>7,72d</pos> <size>20,9d</size>
@@ -665,6 +669,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_T2_SORT_LIST">
<pos>296,71d</pos> <size>68,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 1044)
@@ -15,6 +15,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_NEWCOL_COLLIST">
<pos>4,36d</pos> <size>124,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 1044)
@@ -4,6 +4,7 @@
<pos>0,0d</pos> <size>142,126d</size>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_NAMEMENU">
<pos>4,4d</pos> <size>85,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_MAKESTYLE">
<pos>92,4d</pos> <size>18,14d</size>
@@ -37,6 +38,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
<pos>4,144d</pos> <size>104,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxCheckBox" name="IDC_EDIT_3D">
<pos>112,144d</pos> <size>24,12d</size>
@@ -44,9 +46,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
<pos>4,184d</pos> <size>133,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
<pos>33,200d</pos> <size>103,-1d</size>
+ <style>wxCB_READONLY</style>
</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1044)
@@ -35,6 +35,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1136">
<pos>6,132d</pos> <size>140,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="ID_STATICDECIMAL_1091">
<pos>6,122d</pos> <size>142,9d</size>
@@ -43,6 +44,7 @@
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1137">
<pos>6,132d</pos> <size>142,-1d</size>
<style>wxCB_SORT</style>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>154,26d</pos> <size>50,14d</size>
@@ -102,6 +104,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1136">
<pos>6,132d</pos> <size>90,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="ID_STATICDECIMAL_1091">
<pos>6,122d</pos> <size>142,9d</size>
@@ -110,6 +113,7 @@
<object class="wxOwnerDrawnComboBox" name="ID_STATICDECIMAL_1137">
<pos>6,132d</pos> <size>142,-1d</size>
<style>wxCB_SORT</style>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 1044)
@@ -29,9 +29,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ALIGNDIALOG_HORIZONTAL">
<pos>4,133d</pos> <size>105,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ALIGNDIALOG_VERTICAL">
<pos>4,158d</pos> <size>105,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 1044)
@@ -170,6 +170,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_FILLQUALLIST">
<pos>48,145d</pos> <size>48,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticBox" name="IDC_GROUP_PRINTLAYERS">
<pos>5,19d</pos> <size>195,30d</size>
@@ -334,6 +335,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="cmb1">
<pos>55,-1094d</pos> <size>81,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="stc5">
<pos>5,112d</pos> <size>25,9d</size>
@@ -420,6 +422,7 @@
<object class="wxOwnerDrawnComboBox" name="IDC_COMBOTYPE">
<pos>110,75d</pos> <size>84,-1d</size>
<style>wxCB_SORT</style>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 1044)
@@ -23,6 +23,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_FILE_TYPE_LIST">
<pos>121,0d</pos> <size>48,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticBox" name="IDC_ACTIVE2">
<pos>213,0d</pos> <size>165,151d</size>
@@ -45,6 +46,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_FILE_TYPE_LIST2">
<pos>326,0d</pos> <size>48,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxCamArtControl" name="IDC_ZOOM_TOOL">
<pos>183,6d</pos> <size>20,20d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc (revision 1044)
@@ -2497,7 +2497,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<optoken>NameGalleryPropertyIndex</optoken>
</object>
</object>
@@ -3470,7 +3470,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Editable items</tooltip>
<help>Select items from this menu to edit</help>
</object>
@@ -3670,7 +3670,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Editable items</tooltip>
<help>Select items from this menu to edit</help>
</object>
@@ -3856,7 +3856,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Editable items</tooltip>
<help>Select items from this menu to edit</help>
</object>
@@ -3992,7 +3992,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Fill type</tooltip>
<help>Choose the type of fill</help>
</object>
@@ -4010,7 +4010,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Fill tiling</tooltip>
<help>Choose the rate of fade from one point to another</help>
</object>
@@ -4028,7 +4028,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Fill effect</tooltip>
<help>Choose how the fill fades from one colour to another</help>
</object>
@@ -4046,7 +4046,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Fill effect</tooltip>
<help>Choose how the fill fades from one colour to another</help>
</object>
@@ -4123,7 +4123,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Transparency shape</tooltip>
<help>Choose the type of fill</help>
</object>
@@ -4141,7 +4141,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Transparency type</tooltip>
<help>Choose the type of transparency</help>
</object>
@@ -4159,7 +4159,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Fill tiling</tooltip>
<help>Choose the rate of fade from one point to another</help>
</object>
@@ -4177,7 +4177,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Fill effect</tooltip>
<help>Choose how the fill fades from one colour to another</help>
</object>
@@ -5607,7 +5607,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Select an existing brush</tooltip>
<help>Select an existing brush</help>
</object>
@@ -5625,7 +5625,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Select an existing stroke shape / pressure profile</tooltip>
<help>Select an existing stroke shape / pressure profile</help>
</object>
@@ -5706,7 +5706,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Colour blend effect</tooltip>
<help>Choose the way in which colours are blended together</help>
</object>
@@ -6051,7 +6051,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Change the colour effect</tooltip>
<help>Change the colour effect of the contour rings</help>
</object>
@@ -6201,7 +6201,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Bevel type</tooltip>
<help>Select the appearance of the bevel from the list</help>
</object>
@@ -6219,7 +6219,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
<tooltip>Slider type</tooltip>
<help>Use the slider to change the bevel settings</help>
</object>
@@ -6332,7 +6332,7 @@
<font>
<size>8</size>
</font>
- <style>wxCB_DROPDOWN</style>
+ <style>wxCB_READONLY</style>
</object>
</object>
<object class="spacer">
Index: Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 1044)
@@ -20,9 +20,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ES_COMBO_XBEHAVIOUR">
<pos>6,155d</pos> <size>75,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ES_COMBO_YBEHAVIOUR">
<pos>92,155d</pos> <size>78,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 1044)
@@ -108,6 +108,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_BMPOPTS_TIFF">
<pos>165,99d</pos> <size>70,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxButton" name="wxID_OK">
<pos>220,10d</pos> <size>50,14d</size>
@@ -195,6 +196,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_ANIMOPTS_REMOVAL">
<pos>55,180d</pos> <size>67,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticText" name="IDC_RESTORE_STATIC">
<pos>21,178d</pos> <size>30,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 1044)
@@ -8,6 +8,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_IMAGEMAP_APPROX">
<pos>106,26d</pos> <size>75,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 1044)
@@ -7,6 +7,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_SETREMOVAL">
<pos>70,134d</pos> <size>68,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 1044)
@@ -4,6 +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>
</object>
<object class="wxCamArtControl" name="IDC_EDIT_LINEFILL">
<pos>107,400d</pos> <size>18,14d</size>
@@ -31,6 +32,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
<pos>400,147d</pos> <size>104,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxCheckBox" name="IDC_EDIT_3D">
<pos>11200,147d</pos> <size>24,12d</size>
@@ -38,9 +40,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
<pos>3,165d</pos> <size>135,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
<pos>36,183d</pos> <size>103,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 1044)
@@ -405,9 +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>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GRIDTYPE">
<pos>183,4d</pos> <size>54,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_DIVISIONS">
<pos>6,4d</pos> <size>48,-1d</size>
@@ -429,12 +431,14 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_UNITS">
<pos>46,5d</pos> <size>54,-1d</size>
+ <style>wxCB_READONLY</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>
</object>
<title></title>
<label></label>
@@ -548,6 +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>
</object>
<object class="wxButton" name="IDC_INVOKE_LYR_DLG">
<pos>101,3d</pos> <size>12,12d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 1044)
@@ -39,6 +39,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_REGSHAPETOOL_POS">
<pos>73,13d</pos> <size>68,-1d</size>
+ <style>wxCB_READONLY</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 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 1044)
@@ -260,9 +260,11 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_NAMEGAL_PROP_IDX">
<pos>116,92d</pos> <size>36,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_LIBGAL_CLIPTHEME">
<pos>116,92d</pos> <size>45,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>4,80d</pos> <size>152,28d</size>
@@ -291,6 +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>
</object>
<object class="wxButton" name="wxID_OK">
<pos>3,23d</pos> <size>43,14d</size>
@@ -367,6 +370,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>
</object>
<object class="wxCheckBox" name="IDC_GALSORT_REVERSE1">
<pos>23,33d</pos> <size>44,10d</size>
@@ -374,6 +378,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_GALSORT_SORT2">
<pos>95,17d</pos> <size>76,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<object class="wxCheckBox" name="IDC_GALSORT_REVERSE2">
<pos>111,33d</pos> <size>44,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 1043)
+++ Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 1044)
@@ -30,6 +30,7 @@
</object>
<object class="wxOwnerDrawnComboBox" name="IDC_DEBUGDLG_GROUP">
<pos>40,5d</pos> <size>130,-1d</size>
+ <style>wxCB_READONLY</style>
</object>
<title>Camelot debug commands</title>
<label>Camelot debug commands</label>
Xara