Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 28 Sep 2012 16:06:58 Commit: c1a7b1b475a28c73f830b76de7d1dedf5948df3f https://github.com/geany/geany/commit/c1a7b1b475a28c73f830b76de7d1dedf5948df...
Log Message: ----------- Fix various packing issue affecting GTK3 but compatible with GTK2
Modified Paths: -------------- plugins/filebrowser.c plugins/saveactions.c plugins/splitwindow.c src/dialogs.c src/highlighting.c src/plugins.c src/pluginutils.c src/project.c
Modified: plugins/filebrowser.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1109,7 +1109,7 @@ void plugin_init(GeanyData *data) GTK_SCROLLED_WINDOW(scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(scrollwin), file_view); - gtk_container_add(GTK_CONTAINER(file_view_vbox), scrollwin); + gtk_box_pack_start(GTK_BOX(file_view_vbox), scrollwin, TRUE, TRUE, 0);
/* load settings before file_view "realize" callback */ load_settings();
Modified: plugins/saveactions.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -556,7 +556,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
label = gtk_label_new_with_mnemonic(_("Auto save _interval:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(inner_vbox), label); + gtk_box_pack_start(GTK_BOX(inner_vbox), label, TRUE, TRUE, 0);
pref_widgets.autosave_interval_spin = spin = gtk_spin_button_new_with_range(1, 1800, 1); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), autosave_interval);
Modified: plugins/splitwindow.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -173,7 +173,7 @@ static void set_editor(EditWindow *editwin, GeanyEditor *editor)
editwin->sci = editor_create_widget(editor); gtk_widget_show(GTK_WIDGET(editwin->sci)); - gtk_container_add(GTK_CONTAINER(editwin->vbox), GTK_WIDGET(editwin->sci)); + gtk_box_pack_start(GTK_BOX(editwin->vbox), GTK_WIDGET(editwin->sci), TRUE, TRUE, 0);
sync_to_current(editwin->sci, editor->sci);
Modified: src/dialogs.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -1262,9 +1262,9 @@ void dialogs_show_file_properties(GeanyDocument *doc) gtk_misc_set_alignment(GTK_MISC(image), 1.0, 0.5); hbox = gtk_hbox_new(FALSE, 6); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_container_add(GTK_CONTAINER(hbox), image); - gtk_container_add(GTK_CONTAINER(hbox), label); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
table = gtk_table_new(8, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 10); @@ -1394,7 +1394,7 @@ void dialogs_show_file_properties(GeanyDocument *doc) gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
/* add table */ - gtk_container_add(GTK_CONTAINER(vbox), table); + gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
/* create table with the permissions */ perm_table = gtk_table_new(5, 4, TRUE); @@ -1537,7 +1537,7 @@ void dialogs_show_file_properties(GeanyDocument *doc) (GtkAttachOptions) (0), 0, 0); gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0);
- gtk_container_add(GTK_CONTAINER(vbox), perm_table); + gtk_box_pack_start(GTK_BOX(vbox), perm_table ,TRUE, TRUE, 0);
g_free(base_name); g_free(time_changed);
Modified: src/highlighting.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1377,7 +1377,7 @@ void highlighting_show_color_scheme_dialog(void) gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(swin), tree); - gtk_container_add(GTK_CONTAINER(vbox), swin); + gtk_box_pack_start(GTK_BOX(vbox), swin, TRUE, TRUE, 0); g_signal_connect(dialog, "response", G_CALLBACK(on_color_scheme_dialog_response), &dialog); gtk_widget_show_all(dialog); }
Modified: src/plugins.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1484,7 +1484,7 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data)
g_signal_connect(pm_widgets.dialog, "response", G_CALLBACK(pm_dialog_response), NULL);
- gtk_container_add(GTK_CONTAINER(vbox), vbox2); + gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0); gtk_widget_show_all(pm_widgets.dialog); }
Modified: src/pluginutils.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -338,7 +338,7 @@ static void configure_plugins(Plugin *current_plugin) vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); nb = gtk_notebook_new(); gtk_notebook_set_scrollable(GTK_NOTEBOOK(nb), TRUE); - gtk_container_add(GTK_CONTAINER(vbox), nb); + gtk_box_pack_start(GTK_BOX(vbox), nb, TRUE, TRUE, 0);
foreach_list(node, active_plugin_list) {
Modified: src/project.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -177,7 +177,7 @@ void project_new(void)
ui_table_add_row(GTK_TABLE(table), 2, label, bbox, NULL);
- gtk_container_add(GTK_CONTAINER(vbox), table); + gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
/* signals */ g_signal_connect(e->name, "changed", G_CALLBACK(on_name_entry_changed), e);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).