Permalink
Browse files

Backport

svn path=/branches/mono-2-2/mono-tools/; revision=121765
  • Loading branch information...
1 parent 7bd7f8f commit 3457301221a08c4e8d9c3f724860155fbbf42d6f @migueldeicaza migueldeicaza committed Dec 18, 2008
Showing with 26 additions and 26 deletions.
  1. +11 −11 gsharp/gtk-gui/Mono.CSharp.Gui.MainWindow.cs
  2. +15 −15 gsharp/gtk-gui/gui.stetic
@@ -47,10 +47,10 @@ public partial class MainWindow {
private Gtk.Label label1;
- private Gtk.EventBox standalone_container;
-
private Gtk.Notebook shellnotebook;
+ private Gtk.EventBox standalone_container;
+
private Gtk.ScrolledWindow sw;
private Gtk.Label label3;
@@ -139,36 +139,36 @@ public partial class MainWindow {
this.notebook1.SetTabLabel(this.hpaned, this.label1);
this.label1.ShowAll();
// Container child notebook1.Gtk.Notebook+NotebookChild
- this.standalone_container = new Gtk.EventBox();
- this.standalone_container.Name = "standalone_container";
- // Container child standalone_container.Gtk.Container+ContainerChild
this.shellnotebook = new Gtk.Notebook();
this.shellnotebook.CanFocus = true;
this.shellnotebook.Name = "shellnotebook";
this.shellnotebook.CurrentPage = 0;
this.shellnotebook.ShowTabs = false;
this.shellnotebook.Scrollable = true;
// Container child shellnotebook.Gtk.Notebook+NotebookChild
+ this.standalone_container = new Gtk.EventBox();
+ this.standalone_container.Name = "standalone_container";
+ // Container child standalone_container.Gtk.Container+ContainerChild
this.sw = new Gtk.ScrolledWindow();
this.sw.CanFocus = true;
this.sw.Name = "sw";
this.sw.ShadowType = ((Gtk.ShadowType)(1));
- this.shellnotebook.Add(this.sw);
+ this.standalone_container.Add(this.sw);
+ this.shellnotebook.Add(this.standalone_container);
// Notebook tab
this.label3 = new Gtk.Label();
this.label3.Name = "label3";
this.label3.LabelProp = Mono.Unix.Catalog.GetString("C#");
- this.shellnotebook.SetTabLabel(this.sw, this.label3);
+ this.shellnotebook.SetTabLabel(this.standalone_container, this.label3);
this.label3.ShowAll();
- this.standalone_container.Add(this.shellnotebook);
- this.notebook1.Add(this.standalone_container);
- Gtk.Notebook.NotebookChild w8 = ((Gtk.Notebook.NotebookChild)(this.notebook1[this.standalone_container]));
+ this.notebook1.Add(this.shellnotebook);
+ Gtk.Notebook.NotebookChild w8 = ((Gtk.Notebook.NotebookChild)(this.notebook1[this.shellnotebook]));
w8.Position = 1;
// Notebook tab
this.label2 = new Gtk.Label();
this.label2.Name = "label2";
this.label2.LabelProp = Mono.Unix.Catalog.GetString("page2");
- this.notebook1.SetTabLabel(this.standalone_container, this.label2);
+ this.notebook1.SetTabLabel(this.shellnotebook, this.label2);
this.label2.ShowAll();
this.vbox1.Add(this.notebook1);
Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.notebook1]));
View
@@ -140,15 +140,15 @@
</packing>
</child>
<child>
- <widget class="Gtk.EventBox" id="standalone_container">
+ <widget class="Gtk.Notebook" id="shellnotebook">
<property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="CurrentPage">0</property>
+ <property name="ShowTabs">False</property>
+ <property name="Scrollable">True</property>
<child>
- <widget class="Gtk.Notebook" id="shellnotebook">
+ <widget class="Gtk.EventBox" id="standalone_container">
<property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="CurrentPage">0</property>
- <property name="ShowTabs">False</property>
- <property name="Scrollable">True</property>
<child>
<widget class="Gtk.ScrolledWindow" id="sw">
<property name="MemberName" />
@@ -165,17 +165,17 @@
</child>
</widget>
</child>
- <child>
- <widget class="Gtk.Label" id="label3">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes">C#</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
</widget>
</child>
+ <child>
+ <widget class="Gtk.Label" id="label3">
+ <property name="MemberName" />
+ <property name="LabelProp" translatable="yes">C#</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="Position">1</property>

0 comments on commit 3457301

Please sign in to comment.