Replace call to gtk_widget_size_request() that expected to actually

2002-01-01  Havoc Pennington  <hp@pobox.com>

	* 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

diff --git a/ChangeLog b/ChangeLog
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9f4d8ac3475f92e61c894837b746ba375ac97621..83f90821c204689b0b87e81b56fff4c2e4f38e02 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-01-01  Havoc Pennington  <hp@pobox.com>
+
+       * 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  <hp@pobox.com>
 
        * tests/testtext.c (do_insert_and_scroll): remove backward_char

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 9d46cd092c99075ef2e08b537717431f0de1d38a..5b9c1466bf86c5f936665f7ff884a61b64d07299 100644 (file)
--- 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)