Disable tooltips for menu items with submenus .. they still don't really

Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
        tooltips for menu items with submenus .. they still
        don't really work properly. (Missed merge from
        stable)

diff --git a/ChangeLog b/ChangeLog
index 9e71091e7732644188bcb453023593ed9c405b60..c975351a805d048b1b181bb6e812d6ad94587d97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
+        tooltips for menu items with submenus .. they still
+        don't really work properly. (Missed merge from
+       stable)
+
 Sun Sep 29 20:15:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Clear

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9e71091e7732644188bcb453023593ed9c405b60..c975351a805d048b1b181bb6e812d6ad94587d97 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
+        tooltips for menu items with submenus .. they still
+        don't really work properly. (Missed merge from
+       stable)
+
 Sun Sep 29 20:15:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Clear

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9e71091e7732644188bcb453023593ed9c405b60..c975351a805d048b1b181bb6e812d6ad94587d97 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
+        tooltips for menu items with submenus .. they still
+        don't really work properly. (Missed merge from
+       stable)
+
 Sun Sep 29 20:15:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Clear

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9e71091e7732644188bcb453023593ed9c405b60..c975351a805d048b1b181bb6e812d6ad94587d97 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
+        tooltips for menu items with submenus .. they still
+        don't really work properly. (Missed merge from
+       stable)
+
 Sun Sep 29 20:15:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Clear

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9e71091e7732644188bcb453023593ed9c405b60..c975351a805d048b1b181bb6e812d6ad94587d97 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
+        tooltips for menu items with submenus .. they still
+        don't really work properly. (Missed merge from
+       stable)
+
 Sun Sep 29 20:15:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Clear

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9e71091e7732644188bcb453023593ed9c405b60..c975351a805d048b1b181bb6e812d6ad94587d97 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Sep 29 20:20:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable
+        tooltips for menu items with submenus .. they still
+        don't really work properly. (Missed merge from
+       stable)
+
 Sun Sep 29 20:15:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Clear

diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index c9a20b5dc65801464bc249db8ba106a1429307fb..41cfae5e2943f37e105a8041390741f9af002c12 100644 (file)
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -590,7 +590,8 @@ gtk_tooltips_event_handler (GtkWidget *widget,
          /* do nothing */
          break;
        case GDK_ENTER_NOTIFY:
-         gtk_tooltips_start_delay (tooltips, widget);
+         if (!(GTK_IS_MENU_ITEM (widget) && GTK_MENU_ITEM (widget)->submenu))
+           gtk_tooltips_start_delay (tooltips, widget);
          break;
          
        case GDK_LEAVE_NOTIFY:
@@ -608,7 +609,7 @@ gtk_tooltips_event_handler (GtkWidget *widget,
          /* Handle menu items specially ... pend popup for each motion
           * on other widgets, we ignore motion.
           */
-         if (GTK_IS_MENU_ITEM (widget))
+         if (GTK_IS_MENU_ITEM (widget) && !GTK_MENU_ITEM (widget)->submenu)
            {
              /* Completely evil hack to make sure we get the LEAVE_NOTIFY
               */