Use the correct screen for getting the height. (Fix from Stephen Browne,

Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
        the correct screen for getting the height.
        (Fix from Stephen Browne, #96777)

diff --git a/ChangeLog b/ChangeLog
index 9bd6cef549fcf3d202d23b5dfe395ac8da938451..9196946b008cc60ab7629e62795c78b6050a160a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
+       the correct screen for getting the height.
+       (Fix from Stephen Browne, #96777)
+
 Thu Dec  5 16:01:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
        * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9bd6cef549fcf3d202d23b5dfe395ac8da938451..9196946b008cc60ab7629e62795c78b6050a160a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
+       the correct screen for getting the height.
+       (Fix from Stephen Browne, #96777)
+
 Thu Dec  5 16:01:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
        * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9bd6cef549fcf3d202d23b5dfe395ac8da938451..9196946b008cc60ab7629e62795c78b6050a160a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
+       the correct screen for getting the height.
+       (Fix from Stephen Browne, #96777)
+
 Thu Dec  5 16:01:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
        * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9bd6cef549fcf3d202d23b5dfe395ac8da938451..9196946b008cc60ab7629e62795c78b6050a160a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
+       the correct screen for getting the height.
+       (Fix from Stephen Browne, #96777)
+
 Thu Dec  5 16:01:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
        * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9bd6cef549fcf3d202d23b5dfe395ac8da938451..9196946b008cc60ab7629e62795c78b6050a160a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
+       the correct screen for getting the height.
+       (Fix from Stephen Browne, #96777)
+
 Thu Dec  5 16:01:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
        * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9bd6cef549fcf3d202d23b5dfe395ac8da938451..9196946b008cc60ab7629e62795c78b6050a160a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
+       the correct screen for getting the height.
+       (Fix from Stephen Browne, #96777)
+
 Thu Dec  5 16:01:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
        * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index d7c06650c1d44bf7b23a6ae865cc862edd740454..ee2f8a0e15341b8d4bf5cd602aa1b4f44f2af29a 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -417,7 +417,8 @@ gtk_menu_window_size_request (GtkWidget      *window,
 
   if (private->have_position)
     {
-      gint screen_height = gdk_screen_height ();
+      GdkScreen *screen = gtk_widget_get_screen (window);
+      gint screen_height = gdk_screen_get_height (screen);
 
       if (private->y + requisition->height > screen_height)
        requisition->height = screen_height - private->y;