Improving LineTo() test cases

4 files changed, 26 insertions, 24 deletions

diff --git a/GdiTest/LineToDrawingArea.cs b/GdiTest/LineToDrawingArea.cs
index 539014a..a926f5c 100644
--- a/GdiTest/LineToDrawingArea.cs
+++ b/GdiTest/LineToDrawingArea.cs
@@ -142,9 +142,9 @@ namespace GdiTest
 					areas[i].W = w;
 					areas[i].H = h;
 					startp[i].X = areas[i].X + 3 * (w / 4);
-					startp[i].Y = areas[i].Y + (h / 4);
+					startp[i].Y = areas[i].Y + 3 * (h / 4);
 					endp[i].X =   areas[i].X + (w / 4);
-					endp[i].Y =   areas[i].Y + 3 * (h / 4);
+					endp[i].Y =   areas[i].Y + (h / 4);
 					i++;
 					
 					for (i = 0; i < n; i++)
diff --git a/GdiTest/MainWindow.cs b/GdiTest/MainWindow.cs
index 4ffa0da..a9b8ef0 100644
--- a/GdiTest/MainWindow.cs
+++ b/GdiTest/MainWindow.cs
@@ -21,12 +21,25 @@ public partial class MainWindow : Gtk.Window
 		polygonDrawingArea = new PolygonDrawingArea();
 		lineToDrawingArea = new LineToDrawingArea();
 		polylineToDrawingArea = new PolylineToDrawingArea();
-		
-		testDrawingArea = bitBltDrawingArea;
-		testFrame.Add(testDrawingArea);
-		testFrame.ShowAll();
+		FillTestComboBox(testComboBox);
 	}
-
+	
+	private void FillTestComboBox(Gtk.ComboBox cb)
+	{
+		cb.Clear();
+		CellRendererText cell = new CellRendererText();
+		cb.PackStart(cell, false);
+		cb.AddAttribute(cell, "text", 0);
+		ListStore store = new ListStore(typeof (string));
+		cb.Model = store;
+    
+		store.AppendValues("BitBlt");
+		store.AppendValues("Ellipse");
+		store.AppendValues("Polygon");
+		store.AppendValues("LineTo");
+		store.AppendValues("PolylineTo");
+	}
+	
 	protected void OnDeleteEvent (object sender, DeleteEventArgs a)
 	{
 		Application.Quit();
@@ -44,15 +57,15 @@ public partial class MainWindow : Gtk.Window
 		
 		String testSuiteName = testComboBox.ActiveText;
 		
-		if (testSuiteName.Equals("BitBlt"))
+		if (testSuiteName.StartsWith("BitBlt"))
 			testDrawingArea = bitBltDrawingArea;
-		else if (testSuiteName.Equals("Ellipse"))
+		else if (testSuiteName.StartsWith("Ellipse"))
 			testDrawingArea = ellipseDrawingArea;
-		else if (testSuiteName.Equals("Polygon"))
+		else if (testSuiteName.StartsWith("Polygon"))
 			testDrawingArea = polygonDrawingArea;
-		else if (testSuiteName.Equals("LineTo"))
+		else if (testSuiteName.StartsWith("LineTo"))
 			testDrawingArea = lineToDrawingArea;
-		else if (testSuiteName.Equals("PolylineTo"))
+		else if (testSuiteName.StartsWith("PolylineTo"))
 			testDrawingArea = polylineToDrawingArea;
 		
 		if (testDrawingArea != null)
diff --git a/GdiTest/gtk-gui/MainWindow.cs b/GdiTest/gtk-gui/MainWindow.cs
index 9e66c0e..19a9ca4 100644
--- a/GdiTest/gtk-gui/MainWindow.cs
+++ b/GdiTest/gtk-gui/MainWindow.cs
@@ -71,13 +71,7 @@ public partial class MainWindow
 		w4.Y = 30;
 		// Container child mainFixedContainer.Gtk.Fixed+FixedChild
 		this.testComboBox = global::Gtk.ComboBox.NewText ();
-		this.testComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("BitBlt"));
-		this.testComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("LineTo"));
-		this.testComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("PolylineTo"));
-		this.testComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Ellipse"));
-		this.testComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Polygon"));
 		this.testComboBox.Name = "testComboBox";
-		this.testComboBox.Active = 0;
 		this.mainFixedContainer.Add (this.testComboBox);
 		global::Gtk.Fixed.FixedChild w5 = ((global::Gtk.Fixed.FixedChild)(this.mainFixedContainer[this.testComboBox]));
 		w5.X = 79;
diff --git a/GdiTest/gtk-gui/gui.stetic b/GdiTest/gtk-gui/gui.stetic
index 25d1a85..95b55d1 100644
--- a/GdiTest/gtk-gui/gui.stetic
+++ b/GdiTest/gtk-gui/gui.stetic
@@ -92,12 +92,7 @@
           <widget class="Gtk.ComboBox" id="testComboBox">
             <property name="MemberName" />
             <property name="IsTextCombo">True</property>
-            <property name="Items" translatable="yes">BitBlt
-LineTo
-PolylineTo
-Ellipse
-Polygon</property>
-            <property name="Active">0</property>
+            <property name="Items" translatable="yes" />
             <signal name="Changed" handler="OnTestComboBoxChanged" />
           </widget>
           <packing>