misc gtk touchups

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 513aa4a4d902801839a244f3c73788e15db95288..d9413e9aeb8b746c2dd121d5d20ab1ee2f6755d7 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -19,6 +19,9 @@
 
 /* #define DEBUG_DND 1 */ /* Shouldn't be needed much these days */
 
+/* If you don't want to use gdk's signal handlers define this */
+/* #define I_NEED_TO_ACTUALLY_DEBUG_MY_PROGRAMS 1 */
+
 #include <X11/Xlocale.h>
 #include <ctype.h>
 #include <signal.h>
@@ -261,6 +264,7 @@ gdk_init (int    *argc,
 
   X_GETTIMEOFDAY (&start);
 
+#ifndef I_NEED_TO_ACTUALLY_DEBUG_MY_PROGRAMS
   signal (SIGHUP, gdk_signal);
   signal (SIGINT, gdk_signal);
   signal (SIGQUIT, gdk_signal);
@@ -268,6 +272,7 @@ gdk_init (int    *argc,
   signal (SIGSEGV, gdk_signal);
   signal (SIGPIPE, gdk_signal);
   signal (SIGTERM, gdk_signal);
+#endif
 
   gdk_display_name = NULL;
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 513aa4a4d902801839a244f3c73788e15db95288..d9413e9aeb8b746c2dd121d5d20ab1ee2f6755d7 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -19,6 +19,9 @@
 
 /* #define DEBUG_DND 1 */ /* Shouldn't be needed much these days */
 
+/* If you don't want to use gdk's signal handlers define this */
+/* #define I_NEED_TO_ACTUALLY_DEBUG_MY_PROGRAMS 1 */
+
 #include <X11/Xlocale.h>
 #include <ctype.h>
 #include <signal.h>
@@ -261,6 +264,7 @@ gdk_init (int    *argc,
 
   X_GETTIMEOFDAY (&start);
 
+#ifndef I_NEED_TO_ACTUALLY_DEBUG_MY_PROGRAMS
   signal (SIGHUP, gdk_signal);
   signal (SIGINT, gdk_signal);
   signal (SIGQUIT, gdk_signal);
@@ -268,6 +272,7 @@ gdk_init (int    *argc,
   signal (SIGSEGV, gdk_signal);
   signal (SIGPIPE, gdk_signal);
   signal (SIGTERM, gdk_signal);
+#endif
 
   gdk_display_name = NULL;
 

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index ab8180f8081b8991f8d9a6cd42849d1be2d03f8c..1999666642cd2b91be45df197fa1938889501897 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -471,7 +471,7 @@ gtk_tree_item_size_allocate (GtkWidget     *widget,
       child_allocation.x = border_width + GTK_TREE(widget->parent)->current_indent;
       child_allocation.y = GTK_CONTAINER (widget)->border_width;
 
-#ifdef 0
+#if 0
       child_allocation.height = allocation->height - child_allocation.y * 2;
       child_allocation.width = item->pixmaps_box->requisition.width;