diff --git a/ChangeLog b/ChangeLog index 6ff8d354d37aab0aef347ac0c1466020dd2a3944..3e0771ce2dfa14abce0f4e36c2cec1b32f6270a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-26 Matthias Clasen + + * gtk/gtkaboutdialog.c (display_license_dialog): Make sure + the license dialog is initially displayed without a horizontal + scrollbar. + (gtk_about_dialog_class_init): Document the fact that the + license text is not wrapped. (#165012, Christian Rose) + 2005-01-25 Matthias Clasen * gtk/gtkbutton.c (gtk_button_set_image): Fix docs. (#165180, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6ff8d354d37aab0aef347ac0c1466020dd2a3944..3e0771ce2dfa14abce0f4e36c2cec1b32f6270a1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-01-26 Matthias Clasen + + * gtk/gtkaboutdialog.c (display_license_dialog): Make sure + the license dialog is initially displayed without a horizontal + scrollbar. + (gtk_about_dialog_class_init): Document the fact that the + license text is not wrapped. (#165012, Christian Rose) + 2005-01-25 Matthias Clasen * gtk/gtkbutton.c (gtk_button_set_image): Fix docs. (#165180, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6ff8d354d37aab0aef347ac0c1466020dd2a3944..3e0771ce2dfa14abce0f4e36c2cec1b32f6270a1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-01-26 Matthias Clasen + + * gtk/gtkaboutdialog.c (display_license_dialog): Make sure + the license dialog is initially displayed without a horizontal + scrollbar. + (gtk_about_dialog_class_init): Document the fact that the + license text is not wrapped. (#165012, Christian Rose) + 2005-01-25 Matthias Clasen * gtk/gtkbutton.c (gtk_button_set_image): Fix docs. (#165180, diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 46289a246ec925413b1695e466cb835c9a6d20e1..c012cffff0118027d6385f26548c7b2157112572 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -250,7 +250,8 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass) * * The license of the program. This string is displayed in a * text view in a secondary dialog, therefore it is fine to use - * a long multi-paragraph text. + * a long multi-paragraph text. Note that the text is not wrapped + * in the text view, thus it must contain the intended linebreaks. * * Since: 2.6 */ @@ -1959,8 +1960,9 @@ display_license_dialog (GtkWidget *button, gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_AUTOMATIC, + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + g_signal_connect (sw, "map", G_CALLBACK (set_policy), NULL); gtk_container_set_border_width (GTK_CONTAINER (sw), 8); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), sw, TRUE, TRUE, 0);