From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 19 Sep 2008 10:05:13 +0000 (+0000)
Subject: (x_wm_set_size_hint): Use x_display_pixel_width and x_display_pixel_height.
X-Git-Tag: emacs-pretest-23.0.90~2847
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e7600a697749d3bc50c844e153647e0407ae503;p=emacs.git

(x_wm_set_size_hint): Use x_display_pixel_width and x_display_pixel_height.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ed40d242b3e..cf29620c36b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* xterm.c (x_wm_set_size_hint): Use x_display_pixel_width and
+	x_display_pixel_height.
+
 2008-09-19  Juanma Barranquero  <lekktu@gmail.com>
 
 	* frame.c (x_fullscreen_adjust): Declare var as Display_Info.
diff --git a/src/xterm.c b/src/xterm.c
index b948f042b6a..f272c934043 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9619,10 +9619,10 @@ x_wm_set_size_hint (f, flags, user_position)
 
   size_hints.width_inc = FRAME_COLUMN_WIDTH (f);
   size_hints.height_inc = FRAME_LINE_HEIGHT (f);
-  size_hints.max_width
-    = FRAME_X_DISPLAY_INFO (f)->width - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
-  size_hints.max_height
-    = FRAME_X_DISPLAY_INFO (f)->height - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
+  size_hints.max_width = x_display_pixel_width (FRAME_X_DISPLAY_INFO (f))
+    - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
+  size_hints.max_height = x_display_pixel_height (FRAME_X_DISPLAY_INFO (f))
+    - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
 
   /* Calculate the base and minimum sizes.