disconnect hadj & vadj, not 2 * hadj.

Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.

diff --git a/ChangeLog b/ChangeLog
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d90610d87e0aba9fc724bbd5eccbf99535faa842..b3e573e7766115422da76540f7523c33acb79ed5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
+       2 * hadj.
+
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * configure.in:

diff --git a/NEWS b/NEWS
index 3e7b10c07bc2a615ff0766bd8364b106f2cce67f..2d92264b7944bf549e45290a9e502d27b78fbded 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,24 @@
 What is new in GTK+ 1.1.5:
 
 * Theme integration
+* Widget style modification is now handled through GtkRcStyles
 * GtkPixmaps now grey out pixmaps when insensitive
 * Notebook enhancements
 * Shadow configurability for menubars and handleboxes
 * DND enhancements
-* gtkfilesel how supports automounters better
+* gtkfilesel now supports automounters better
 * Implementation of expose compression
 * Queued redraws of partial areas
-* Scrolledwindow/Viewport enhancements
+* Scrolledwindow (+Viewport) source incompatibilities, children that are added
+  to a scrolled window don't get an automatic viewport anymore. a convenience
+  function gtk_scrolled_window_add_with_viewport() is suplied for this task
+* Deprecated functions will now issue a message, informing the programmer about
+  the use of this function. These functions will get removed in future versions
+* Non-functional functions got removed entirely
+* gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
+  A new function gtk_object_default_construct() is provided now which should
+  be called after every gtk_type_new() to perfom the auto-construction
+* Improved argument support of several widgets
 * Bug Fixes
 
 What is new in GTK+ 1.1.3:

diff --git a/TODO b/TODO
index 643619cc7a7fdb7a66fc06a6ce6d9a9936f6c05d..3ae009b7454d579158676a5dde37fa28460aba75 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 For 1.2.0 release:
--      remove deprecated functions from *.[hc] files, especially the
-       non-functional ones.
+-      remove deprecated functions from *.[hc] files.
+-      finish composite child stuff.
+-      implement constructor functionality for all widgets.
        
 Bugs:
  * Change bitfields to guints from enums, or vice versa?

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 78b987e49d9bf703bc14b5fdbd217bec8a7a0796..195b74dafff5052ef969f7f5af8a4eae699ba797 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -794,6 +794,14 @@ gtk_text_set_adjustments (GtkText       *text,
 {
   g_return_if_fail (text != NULL);
   g_return_if_fail (GTK_IS_TEXT (text));
+  if (hadj)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
+  else
+    hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+  if (vadj)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
+  else
+    vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
   
   if (text->hadj && (text->hadj != hadj))
     {
@@ -807,12 +815,6 @@ gtk_text_set_adjustments (GtkText       *text,
       gtk_object_unref (GTK_OBJECT (text->vadj));
     }
   
-  if (!hadj)
-    hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-  
-  if (!vadj)
-    vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-  
   if (text->hadj != hadj)
     {
       text->hadj = hadj;
@@ -1140,7 +1142,7 @@ gtk_text_destroy (GtkObject *object)
   text = (GtkText*) object;
 
   gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
-  gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
+  gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
 
   if (text->timer)
     {