[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1295
Date       : Sun Jun 11 20:35:35 BST 2006

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

Fix combos on line gallery
Remove residual resources.h on a clean build


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 1294)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 1295)
@@ -153,7 +153,9 @@
 		    "IDC_SPACING_EDIT" => 30,
 		    "IDC_TRACKING_EDIT" => 30,
 		    "IDC_KERN_EDIT_Y" => 40,
-		    "IDC_KERN_EDIT_X" => 40
+		    "IDC_KERN_EDIT_X" => 40,
+		    "IDLB_JOINTYPE_LIST_BOX" => 96,
+		    "IDLB_LINECAP_LIST_BOX" => 96
 		   );
     return $cnamemap{ $control } || $default;
 }
@@ -180,6 +182,8 @@
 		    "IDC_BEVEL_TYPE_COMBO" => "wxCB_READONLY",
 		    "IDC_BEVEL_SLIDER_COMBO" => "wxCB_READONLY",
 		    "IDC_FONT_COMBO" => "wxCB_READONLY",
+		    "IDLB_JOINTYPE_LIST_BOX" => "wxCB_READONLY",
+		    "IDLB_LINECAP_LIST_BOX" => "wxCB_READONLY"
 		   );
     return $cnamemap{ $control } || $default;
 }
Index: Trunk/XaraLX/wxOil/Makefile.am
===================================================================
--- Trunk/XaraLX/wxOil/Makefile.am	(revision 1294)
+++ Trunk/XaraLX/wxOil/Makefile.am	(revision 1295)
@@ -6,7 +6,10 @@
 BUILT_SOURCES	= svnversion.h resources.h
 # Note we don't clean xrc.d and xrc.stamp here to avoid a loop
 CLEANFILES		= svnversion.h
-MOSTLYCLEANFILES = resources.h xrc/dialogs.xrc xrc/strings.xrc xrc/strings.lst xrc/xaralx.po xrc/resources.xrs xrc/xrc.check
+# explicitly remove resources.h from TOPDIR as well. It should not be there on an out of tree build,
+# but running build-resources manually (or switching to an out-of-tree build) can leave it there
+# which then confuses things
+MOSTLYCLEANFILES = $(TOPDIR)/wxOil/resources.h resources.h xrc/dialogs.xrc xrc/strings.xrc xrc/strings.lst xrc/xaralx.po xrc/resources.xrs xrc/xrc.check
 noinst_LIBRARIES	= libwxOil.a
 
 # the application source, library search path, and link libraries
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1294)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1295)
@@ -2396,11 +2396,11 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxOwnerDrawnComboBox" name="IDLB_JOINTYPE_LIST_BOX">
-                    <size>80,-1</size>
+                    <size>96,-1</size>
                     <font>
                         <size>8</size>
                     </font>
-                    <style>wxCB_DROPDOWN</style>
+                    <style>wxCB_READONLY</style>
                     <buttonsize>17,-1</buttonsize>
                     <optoken>ChangeLineJoin</optoken>
                 </object>
@@ -2414,11 +2414,11 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxOwnerDrawnComboBox" name="IDLB_LINECAP_LIST_BOX">
-                    <size>80,-1</size>
+                    <size>96,-1</size>
                     <font>
                         <size>8</size>
                     </font>
-                    <style>wxCB_DROPDOWN</style>
+                    <style>wxCB_READONLY</style>
                     <buttonsize>17,-1</buttonsize>
                     <optoken>ChangeLineCap</optoken>
                 </object>


Xara