gnucash maint: Bug 701052 - cannot click on 'cancel' or 'ok' button on dialogue box

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/7edf2c8f (commit)
	from  https://github.com/Gnucash/gnucash/commit/70e041fd (commit)



commit 7edf2c8f7f9a5f4410e8b76e26cb5bc00697fc07
Author: Chenxiong Qi <cqi at redhat.com>
Date:   Sat Sep 27 00:05:25 2014 +0800

    Bug 701052 - cannot click on 'cancel' or 'ok' button on dialogue box

diff --git a/src/gnome/dialog-sx-editor.c b/src/gnome/dialog-sx-editor.c
index 3781455..76fe495 100644
--- a/src/gnome/dialog-sx-editor.c
+++ b/src/gnome/dialog-sx-editor.c
@@ -1271,6 +1271,7 @@ void
 schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
 {
     GtkBox *b;
+    GtkWidget *example_cal_scrolled_win = NULL;
 
     b = GTK_BOX(gtk_builder_get_object (sxed->builder, "gncfreq_hbox"));
 
@@ -1281,16 +1282,25 @@ schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
     g_signal_connect( sxed->gncfreq, "changed",
                       G_CALLBACK(gnc_sxed_freq_changed),
                       sxed );
-    gtk_container_add( GTK_CONTAINER(b), GTK_WIDGET(sxed->gncfreq) );
+
+    gtk_box_pack_start(GTK_BOX(b), GTK_WIDGET(sxed->gncfreq), TRUE, TRUE, 0);
 
     b = GTK_BOX(gtk_builder_get_object (sxed->builder, "example_cal_hbox" ));
+
+    example_cal_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(example_cal_scrolled_win),
+                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+    gtk_box_pack_start(GTK_BOX(b), example_cal_scrolled_win, TRUE, TRUE, 0);
+
     sxed->dense_cal_model = gnc_dense_cal_store_new(EX_CAL_NUM_MONTHS * 31);
     sxed->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new_with_model(GNC_DENSE_CAL_MODEL(sxed->dense_cal_model)));
     g_assert(sxed->example_cal);
     gnc_dense_cal_set_num_months( sxed->example_cal, EX_CAL_NUM_MONTHS );
     gnc_dense_cal_set_months_per_col( sxed->example_cal, EX_CAL_MO_PER_COL );
-    gtk_container_add( GTK_CONTAINER(b), GTK_WIDGET(sxed->example_cal) );
-    gtk_widget_show( GTK_WIDGET(sxed->example_cal) );
+
+    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(example_cal_scrolled_win),
+                                          GTK_WIDGET(sxed->example_cal));
+    gtk_widget_show_all( example_cal_scrolled_win );
 }
 
 
diff --git a/src/gnome/gtkbuilder/dialog-sx.glade b/src/gnome/gtkbuilder/dialog-sx.glade
index bc1f034..a2a4052 100644
--- a/src/gnome/gtkbuilder/dialog-sx.glade
+++ b/src/gnome/gtkbuilder/dialog-sx.glade
@@ -1085,7 +1085,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>



Summary of changes:
 src/gnome/dialog-sx-editor.c         | 16 +++++++++++++---
 src/gnome/gtkbuilder/dialog-sx.glade |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)