started adding more GUI elements

4 files changed, 65 insertions, 10 deletions

diff --git a/GdiTest.userprefs b/GdiTest.userprefs
index ccf240c..11cd185 100644
--- a/GdiTest.userprefs
+++ b/GdiTest.userprefs
@@ -1,11 +1,11 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="GdiTest/BitBltDrawingArea.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="GdiTest/FreeRDPGDI.cs">
     <Files>
-      <File FileName="GdiTest/BitBltDrawingArea.cs" Line="24" Column="18" />
-      <File FileName="GdiTest/Gdi.cs" Line="31" Column="27" />
-      <File FileName="GdiTest/Win32Gdi.cs" Line="45" Column="17" />
-      <File FileName="GdiTest/Main.cs" Line="10" Column="4" />
+      <File FileName="GdiTest/BitBltDrawingArea.cs" Line="49" Column="6" />
+      <File FileName="GdiTest/GDI.cs" Line="26" Column="13" />
+      <File FileName="GdiTest/FreeRDPGDI.cs" Line="49" Column="21" />
+      <File FileName="GdiTest/Win32GDI.cs" Line="6" Column="29" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/GdiTest/GdiTest.pidb b/GdiTest/GdiTest.pidb
index 351ed84..d327793 100644
--- a/GdiTest/GdiTest.pidb
+++ b/GdiTest/GdiTest.pidb
diff --git a/GdiTest/gtk-gui/MainWindow.cs b/GdiTest/gtk-gui/MainWindow.cs
index 8e9739c..fd10225 100644
--- a/GdiTest/gtk-gui/MainWindow.cs
+++ b/GdiTest/gtk-gui/MainWindow.cs
@@ -3,6 +3,12 @@
 
 public partial class MainWindow
 {
+	private global::Gtk.Fixed mainFixedContainer;
+
+	private global::Gtk.ComboBox testSelectorComboBox;
+
+	private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
 	protected virtual void Build ()
 	{
 		global::Stetic.Gui.Initialize (this);
@@ -10,11 +16,34 @@ public partial class MainWindow
 		this.Name = "MainWindow";
 		this.Title = global::Mono.Unix.Catalog.GetString ("MainWindow");
 		this.WindowPosition = ((global::Gtk.WindowPosition)(4));
+		// Container child MainWindow.Gtk.Container+ContainerChild
+		this.mainFixedContainer = new global::Gtk.Fixed ();
+		this.mainFixedContainer.Name = "mainFixedContainer";
+		this.mainFixedContainer.HasWindow = false;
+		// Container child mainFixedContainer.Gtk.Fixed+FixedChild
+		this.testSelectorComboBox = global::Gtk.ComboBox.NewText ();
+		this.testSelectorComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("LineTo()"));
+		this.testSelectorComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("BitBlt()"));
+		this.testSelectorComboBox.Name = "testSelectorComboBox";
+		this.testSelectorComboBox.Active = 0;
+		this.mainFixedContainer.Add (this.testSelectorComboBox);
+		global::Gtk.Fixed.FixedChild w1 = ((global::Gtk.Fixed.FixedChild)(this.mainFixedContainer[this.testSelectorComboBox]));
+		w1.X = 2;
+		w1.Y = 34;
+		// Container child mainFixedContainer.Gtk.Fixed+FixedChild
+		this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+		this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+		this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+		this.mainFixedContainer.Add (this.GtkScrolledWindow);
+		global::Gtk.Fixed.FixedChild w2 = ((global::Gtk.Fixed.FixedChild)(this.mainFixedContainer[this.GtkScrolledWindow]));
+		w2.X = 2;
+		w2.Y = 367;
+		this.Add (this.mainFixedContainer);
 		if ((this.Child != null)) {
 			this.Child.ShowAll ();
 		}
-		this.DefaultWidth = 400;
-		this.DefaultHeight = 300;
+		this.DefaultWidth = 770;
+		this.DefaultHeight = 449;
 		this.Show ();
 		this.DeleteEvent += new global::Gtk.DeleteEventHandler (this.OnDeleteEvent);
 	}
diff --git a/GdiTest/gtk-gui/gui.stetic b/GdiTest/gtk-gui/gui.stetic
index e081656..6f6858c 100644
--- a/GdiTest/gtk-gui/gui.stetic
+++ b/GdiTest/gtk-gui/gui.stetic
@@ -6,15 +6,41 @@
   </configuration>
   <import>
     <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="..\bin\Debug\GdiTest.exe" internal="true" />
+    <widget-library name="../bin/Debug/GdiTest.exe" internal="true" />
   </import>
-  <widget class="Gtk.Window" id="MainWindow" design-size="400 300">
+  <widget class="Gtk.Window" id="MainWindow" design-size="770 449">
     <property name="MemberName" />
     <property name="Title" translatable="yes">MainWindow</property>
     <property name="WindowPosition">CenterOnParent</property>
     <signal name="DeleteEvent" handler="OnDeleteEvent" />
     <child>
-      <placeholder />
+      <widget class="Gtk.Fixed" id="mainFixedContainer">
+        <property name="MemberName" />
+        <property name="HasWindow">False</property>
+        <child>
+          <widget class="Gtk.ComboBox" id="testSelectorComboBox">
+            <property name="MemberName" />
+            <property name="IsTextCombo">True</property>
+            <property name="Items" translatable="yes">LineTo()
+BitBlt()</property>
+            <property name="Active">0</property>
+          </widget>
+          <packing>
+            <property name="X">2</property>
+            <property name="Y">34</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
+            <property name="MemberName" />
+            <property name="ShadowType">In</property>
+          </widget>
+          <packing>
+            <property name="X">2</property>
+            <property name="Y">367</property>
+          </packing>
+        </child>
+      </widget>
     </child>
   </widget>
 </stetic-interface>
\ No newline at end of file