AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

gtk-demo: Fix fallout from the notebook page merge

Browse Source 
I have overlooked a few places where the child properties
were used. Sorry.
This commit is contained in:
Matthias Clasen 2019-02-21 11:13:53 -05:00
parent e7824d8f9e
commit b1fe5d8f1f
2 changed files with 50 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demos/gtk-demo/main.c
View File

@ -667,10 +667,9 @@ add_data_tab (const gchar *demoname)
label = gtk_label_new (resources[i]); label = gtk_label_new (resources[i]);
gtk_widget_show (label); gtk_widget_show (label);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
gtk_container_child_set (GTK_CONTAINER (notebook), g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
widget, "tab-expand", TRUE,
"tab-expand", TRUE, NULL);
NULL);
g_free (resource_name); g_free (resource_name);
} }

98
demos/gtk-demo/main.ui
View File

@ -86,65 +86,61 @@
<property name="show-border">0</property> <property name="show-border">0</property>
<property name="expand">1</property> <property name="expand">1</property>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkNotebookPage">
<property name="can-focus">1</property> <property name="tab-expand">1</property>
<child> <property name="child">
<object class="GtkTextView" id="info-textview"> <object class="GtkScrolledWindow">
<property name="can-focus">1</property> <property name="can-focus">1</property>
<property name="left-margin">20</property> <child>
<property name="right-margin">20</property> <object class="GtkTextView" id="info-textview">
<property name="top-margin">20</property> <property name="can-focus">1</property>
<property name="bottom-margin">20</property> <property name="left-margin">20</property>
<property name="pixels-above-lines">2</property> <property name="right-margin">20</property>
<property name="pixels-below-lines">2</property> <property name="top-margin">20</property>
<property name="editable">0</property> <property name="bottom-margin">20</property>
<property name="wrap-mode">word</property> <property name="pixels-above-lines">2</property>
<property name="cursor-visible">0</property> <property name="pixels-below-lines">2</property>
<property name="editable">0</property>
<property name="wrap-mode">word</property>
<property name="cursor-visible">0</property>
</object>
</child>
</object> </object>
</child> </property>
<property name="tab">
<object class="GtkLabel">
<property name="label" translatable="yes">_Info</property>
<property name="use-underline">1</property>
</object>
</property>
</object> </object>
<packing>
<property name="tab-expand">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="label" translatable="yes">_Info</property>
<property name="use-underline">1</property>
</object>
<packing>
<property name="tab-expand">1</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkScrolledWindow" id="source-scrolledwindow"> <object class="GtkNotebookPage">
<property name="can-focus">1</property>
<child>
<object class="GtkTextView" id="source-textview">
<property name="can-focus">1</property>
<property name="left-margin">20</property>
<property name="right-margin">20</property>
<property name="top-margin">20</property>
<property name="bottom-margin">20</property>
<property name="editable">0</property>
<property name="cursor-visible">0</property>
</object>
</child>
</object>
<packing>
<property name="position">1</property> <property name="position">1</property>
<property name="tab-expand">1</property> <property name="tab-expand">1</property>
</packing> <property name="child">
</child> <object class="GtkScrolledWindow" id="source-scrolledwindow">
<child type="tab"> <property name="can-focus">1</property>
<object class="GtkLabel"> <child>
<property name="label" translatable="yes">Source</property> <object class="GtkTextView" id="source-textview">
<property name="can-focus">1</property>
<property name="left-margin">20</property>
<property name="right-margin">20</property>
<property name="top-margin">20</property>
<property name="bottom-margin">20</property>
<property name="editable">0</property>
<property name="cursor-visible">0</property>
</object>
</child>
</object>
</property>
<property name="tab">
<object class="GtkLabel">
<property name="label" translatable="yes">Source</property>
</object>
</property>
</object> </object>
<packing>
<property name="position">1</property>
<property name="tab-fill">0</property>
</packing>
</child> </child>
</object> </object>
</child> </child>