fetch the inintial value of attributes.event_mask from

Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>

        * gtkitem.c:
        * gtktree.c:
        * gtklist.c: fetch the inintial value of attributes.event_mask from
        gtk_widget_get_events (widget) (pointed out by Damon Chaplin
        <DAChaplin@email.msn.com>).

diff --git a/ChangeLog b/ChangeLog
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1ffaaa274052a00b094ce5c4d0472426b67110ca..a64a370f43bff787929d7188ae499e8ad89cc759 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998  Tim Janik  <timj@gimp.org>
+
+       * gtkitem.c:
+       * gtktree.c:
+       * gtklist.c: fetch the inintial value of attributes.event_mask from
+       gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+       <DAChaplin@email.msn.com>).
+
 Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>
 
        * gdk/gdk.h:

diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index 6705f372190a03b81f926cbe4f9658fd11a6e9b2..69726b0ae4a7f8c6fcc58be5060ebe6f84619a36 100644 (file)
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -177,7 +177,8 @@ gtk_item_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = (GDK_EXPOSURE_MASK |
+  attributes.event_mask = (gtk_widget_get_events (widget) |
+                          GDK_EXPOSURE_MASK |
                           GDK_BUTTON_PRESS_MASK |
                           GDK_BUTTON_RELEASE_MASK |
                           GDK_ENTER_NOTIFY_MASK |

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 2a44474e6a51f8ce4ff1edf7e21f305df8d6b831..063041c60dacd6b793dca6b9b796e265a689e77e 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -596,7 +596,7 @@ gtk_list_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = GDK_EXPOSURE_MASK;
+  attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index acfbfb53dda01659e6d8754b7e5fa540d33b1eb7..b501486ad0cd4a8d7448298935d720d5c3705038 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -644,7 +644,7 @@ gtk_tree_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = GDK_EXPOSURE_MASK;
+  attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index e020e3b49e2f3bd385f934f8d1182f40ee08503c..4c675e8d697f60baa1c82b94b7662d629512c3dc 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -1494,8 +1494,10 @@ static void
 create_handle_box ()
 {
   static GtkWidget* window = NULL;
+  GtkWidget *handle_box;
   GtkWidget *hbox;
   GtkWidget *toolbar;
+  GtkWidget *label;
        
   if (!window)
   {
@@ -1509,22 +1511,42 @@ create_handle_box ()
                        GTK_SIGNAL_FUNC(destroy_window), &window);
     
     gtk_container_border_width (GTK_CONTAINER (window), 20);
-    
-    hbox = gtk_handle_box_new ();
+
+    hbox = gtk_hbox_new (FALSE, 10);
     gtk_container_add (GTK_CONTAINER (window), hbox);
-    gtk_signal_connect (GTK_OBJECT (hbox),
+    gtk_widget_show (hbox);
+    
+    handle_box = gtk_handle_box_new ();
+    gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+    gtk_signal_connect (GTK_OBJECT (handle_box),
                        "child_attached",
                        GTK_SIGNAL_FUNC (handle_box_child_signal),
                        "attached");
-    gtk_signal_connect (GTK_OBJECT (hbox),
+    gtk_signal_connect (GTK_OBJECT (handle_box),
                        "child_detached",
                        GTK_SIGNAL_FUNC (handle_box_child_signal),
                        "detached");
-    gtk_widget_show (hbox);
+    gtk_widget_show (handle_box);
 
     toolbar = make_toolbar (window);
-    gtk_container_add (GTK_CONTAINER (hbox), toolbar);
+    gtk_container_add (GTK_CONTAINER (handle_box), toolbar);
     gtk_widget_show (toolbar);
+
+    handle_box = gtk_handle_box_new ();
+    gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+    gtk_signal_connect (GTK_OBJECT (handle_box),
+                       "child_attached",
+                       GTK_SIGNAL_FUNC (handle_box_child_signal),
+                       "attached");
+    gtk_signal_connect (GTK_OBJECT (handle_box),
+                       "child_detached",
+                       GTK_SIGNAL_FUNC (handle_box_child_signal),
+                       "detached");
+    gtk_widget_show (handle_box);
+
+    label = gtk_label_new ("Fooo!");
+    gtk_container_add (GTK_CONTAINER (handle_box), label);
+    gtk_widget_show (label);
   }
 
   if (!GTK_WIDGET_VISIBLE (window))

diff --git a/tests/testgtk.c b/tests/testgtk.c
index e020e3b49e2f3bd385f934f8d1182f40ee08503c..4c675e8d697f60baa1c82b94b7662d629512c3dc 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1494,8 +1494,10 @@ static void
 create_handle_box ()
 {
   static GtkWidget* window = NULL;
+  GtkWidget *handle_box;
   GtkWidget *hbox;
   GtkWidget *toolbar;
+  GtkWidget *label;
        
   if (!window)
   {
@@ -1509,22 +1511,42 @@ create_handle_box ()
                        GTK_SIGNAL_FUNC(destroy_window), &window);
     
     gtk_container_border_width (GTK_CONTAINER (window), 20);
-    
-    hbox = gtk_handle_box_new ();
+
+    hbox = gtk_hbox_new (FALSE, 10);
     gtk_container_add (GTK_CONTAINER (window), hbox);
-    gtk_signal_connect (GTK_OBJECT (hbox),
+    gtk_widget_show (hbox);
+    
+    handle_box = gtk_handle_box_new ();
+    gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+    gtk_signal_connect (GTK_OBJECT (handle_box),
                        "child_attached",
                        GTK_SIGNAL_FUNC (handle_box_child_signal),
                        "attached");
-    gtk_signal_connect (GTK_OBJECT (hbox),
+    gtk_signal_connect (GTK_OBJECT (handle_box),
                        "child_detached",
                        GTK_SIGNAL_FUNC (handle_box_child_signal),
                        "detached");
-    gtk_widget_show (hbox);
+    gtk_widget_show (handle_box);
 
     toolbar = make_toolbar (window);
-    gtk_container_add (GTK_CONTAINER (hbox), toolbar);
+    gtk_container_add (GTK_CONTAINER (handle_box), toolbar);
     gtk_widget_show (toolbar);
+
+    handle_box = gtk_handle_box_new ();
+    gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+    gtk_signal_connect (GTK_OBJECT (handle_box),
+                       "child_attached",
+                       GTK_SIGNAL_FUNC (handle_box_child_signal),
+                       "attached");
+    gtk_signal_connect (GTK_OBJECT (handle_box),
+                       "child_detached",
+                       GTK_SIGNAL_FUNC (handle_box_child_signal),
+                       "detached");
+    gtk_widget_show (handle_box);
+
+    label = gtk_label_new ("Fooo!");
+    gtk_container_add (GTK_CONTAINER (handle_box), label);
+    gtk_widget_show (label);
   }
 
   if (!GTK_WIDGET_VISIBLE (window))