diff --git a/ChangeLog b/ChangeLog index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9f4d8ac347..83f90821c2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-01-01 Havoc Pennington + + * gtk/gtktextview.c (changed_handler): Replace call to + gtk_widget_size_request() that expected to actually compute the + request with a direct use of widget_class->size_request, so we get + our size request right; fixes remaining part of #63065 reported by + Matthias Clasen + 2001-12-31 Havoc Pennington * tests/testtext.c (do_insert_and_scroll): remove backward_char diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 9d46cd092c..5b9c1466bf 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -3038,7 +3038,12 @@ changed_handler (GtkTextLayout *layout, GtkRequisition new_req; old_req = widget->requisition; - gtk_widget_size_request (widget, &new_req); + + /* Use this instead of gtk_widget_size_request wrapper + * to avoid the optimization which just returns widget->requisition + * if a resize hasn't been queued. + */ + GTK_WIDGET_GET_CLASS (widget)->size_request (widget, &new_req); if (old_req.width != new_req.width || old_req.height != new_req.height)