diff options
| author | Morten Welinder <terra@gnome.org> | 2004-02-04 21:17:54 +0000 |
|---|---|---|
| committer | Morten Welinder <mortenw@src.gnome.org> | 2004-02-04 21:17:54 +0000 |
| commit | 0b14aeea3796876e1dd01c986ff152160ad78f10 (patch) | |
| tree | 3306341a7189c589515dd357b19a2e518cf31d71 | |
| parent | 9f35c7ae42d1be741813429543d079fd2967247c (diff) | |
| download | gtk+-0b14aeea3796876e1dd01c986ff152160ad78f10.tar.gz | |
Show on the right screen. (Fixes bug 133411, apart from the leak.)
2004-02-04 Morten Welinder <terra@gnome.org>
* gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes
bug 133411, apart from the leak.)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtktoolbar.c | 11 |
6 files changed, 32 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2004-02-04 Morten Welinder <terra@gnome.org> + + * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes + bug 133411, apart from the leak.) + Tue Feb 3 13:39:27 2004 Manish Singh <yosh@gimp.org> * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1a936931e0..acc9cd291e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-02-04 Morten Welinder <terra@gnome.org> + + * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes + bug 133411, apart from the leak.) + Tue Feb 3 13:39:27 2004 Manish Singh <yosh@gimp.org> * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1a936931e0..acc9cd291e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-02-04 Morten Welinder <terra@gnome.org> + + * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes + bug 133411, apart from the leak.) + Tue Feb 3 13:39:27 2004 Manish Singh <yosh@gimp.org> * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1a936931e0..acc9cd291e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-02-04 Morten Welinder <terra@gnome.org> + + * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes + bug 133411, apart from the leak.) + Tue Feb 3 13:39:27 2004 Manish Singh <yosh@gimp.org> * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1a936931e0..acc9cd291e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-02-04 Morten Welinder <terra@gnome.org> + + * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes + bug 133411, apart from the leak.) + Tue Feb 3 13:39:27 2004 Manish Singh <yosh@gimp.org> * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 224cb361de..9a4a337c9e 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -2465,12 +2465,15 @@ show_menu (GtkToolbar *toolbar, } } } - + + gtk_window_set_screen (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->menu))), + gtk_widget_get_screen (GTK_WIDGET (toolbar))); gtk_widget_show_all (GTK_WIDGET (priv->menu)); - - gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL, + + gtk_menu_popup (priv->menu, NULL, NULL, menu_position_func, toolbar, - event? event->button : 0, event? event->time : gtk_get_current_event_time()); + event? event->button : 0, + event? event->time : gtk_get_current_event_time()); } static void |