summaryrefslogtreecommitdiff
path: root/gtk/res/netsurf.glade
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2006-11-27 17:13:24 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2006-11-27 17:13:24 +0000
commit5aae53ef919c695136ee52ce30435820d8dc1771 (patch)
tree0236cd51036ec7691d242f2ee420dab09af818a8 /gtk/res/netsurf.glade
parent052e8e7ea86744bdbb06b3402dda51bd6349d072 (diff)
downloadnetsurf-5aae53ef919c695136ee52ce30435820d8dc1771.tar.gz
netsurf-5aae53ef919c695136ee52ce30435820d8dc1771.tar.bz2
Merge GTK frames branch to trunk.
svn path=/trunk/netsurf/; revision=3075
Diffstat (limited to 'gtk/res/netsurf.glade')
-rw-r--r--gtk/res/netsurf.glade29
1 files changed, 3 insertions, 26 deletions
diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade
index 42ab4f97d..aa3bfabd8 100644
--- a/gtk/res/netsurf.glade
+++ b/gtk/res/netsurf.glade
@@ -984,7 +984,7 @@
</child>
<child>
- <widget class="GtkTable" id="table6">
+ <widget class="GtkTable" id="centreTable">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
@@ -993,7 +993,7 @@
<property name="column_spacing">0</property>
<child>
- <widget class="GtkVScrollbar" id="vscrollbar1">
+ <widget class="GtkVScrollbar" id="coreScrollVertical">
<property name="visible">True</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
@@ -1009,29 +1009,6 @@
</child>
<child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingArea">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1062,7 +1039,7 @@
</child>
<child>
- <widget class="GtkHScrollbar" id="hscrollbar1">
+ <widget class="GtkHScrollbar" id="coreScrollHorizontal">
<property name="visible">True</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>