[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 912
Date       : Fri Apr 28 10:33:30 BST 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/rc2xml.pl
   M /Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc

Fixed tabs to have a wxPanel object for Luke


Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl	(revision 911)
+++ Trunk/XaraLX/Scripts/rc2xml.pl	(revision 912)
@@ -144,7 +144,14 @@
 exit (0);
 
 
+sub IsPanel
+{
+    my $name=shift @_;
+    return 1 if ($name=~/^(IDD_TBITMAPSIZE|IDD_TIMAPOPTIONS|IDD_TBROWSER|IDD_TBITMAPOPTIONS|IDD_PALETTE_TAB)$/);
+    return 0;
+}
 
+
 sub LookUpString
 {
     my $strid = shift @_;
@@ -1196,7 +1203,7 @@
     my @rect;
     ReadRect(\@rect);
 
-    print OUTPUT "	<object class=\"wxDialog\"";
+    printf OUTPUT "	<object class=\"%s\"",IsPanel($dlgname)?"wxPanel":"wxDialog";
 
     WriteBasicInfo (@rect, $dlgname);
 
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc	(revision 911)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc	(revision 912)
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <resource>
-	<object class="wxDialog" name="IDD_TBITMAPSIZE">
+	<object class="wxPanel" name="IDD_TBITMAPSIZE">
 			 <pos>0,0d</pos> <size>370,90d</size>
 		<object class="wxStaticBox" name="IDC_T1STATIC1">
 			 <pos>4,5d</pos> <size>140,55d</size>
@@ -78,7 +78,7 @@
 		</object>
 		<title>Bitmap Size</title>
 	</object>
-	<object class="wxDialog" name="IDD_TIMAPOPTIONS">
+	<object class="wxPanel" name="IDD_TIMAPOPTIONS">
 			 <pos>0,0d</pos> <size>370,90d</size>
 		<object class="wxStaticBox" name="IDC_EXP_IMAPTAB_OPTIONS">
 			 <pos>4,4d</pos> <size>180,53d</size>
@@ -149,7 +149,7 @@
 		</object>
 		<title>Image Map</title>
 	</object>
-	<object class="wxDialog" name="IDD_TBROWSER">
+	<object class="wxPanel" name="IDD_TBROWSER">
 			 <pos>0,0d</pos> <size>370,90d</size>
 		<object class="wxStaticBox" name="IDC_T5STATIC1">
 			 <pos>3,7d</pos> <size>110,75d</size>
@@ -194,7 +194,7 @@
 		</object>
 		<title>Browser Preview</title>
 	</object>
-	<object class="wxDialog" name="IDD_TBITMAPOPTIONS">
+	<object class="wxPanel" name="IDD_TBITMAPOPTIONS">
 			 <pos>0,0d</pos> <size>370,90d</size>
 		<object class="wxStaticBox" name="IDC_OPTIONSTAB_JPEG_TEXT1">
 			 <pos>6,20d</pos> <size>119,40d</size>
@@ -226,7 +226,7 @@
 		</object>
 		<title>Options</title>
 	</object>
-	<object class="wxDialog" name="IDD_PALETTE_TAB">
+	<object class="wxPanel" name="IDD_PALETTE_TAB">
 			 <pos>0,0d</pos> <size>370,90d</size>
 		<object class="wxStaticText" name="IDC_T2STATIC1">
 			 <pos>7,8d</pos> <size>30,9d</size>


Xara