# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1221813854 0
# Node ID 5f73593cabcdedabc09303d1aaaed7b4f3c3b52d
# Parent  1f7d70f80eb935dc560bc6caa9f945b527b56be4
* frame.c (x_fullscreen_adjust): Declare var as Display_Info.

* w32fns.c (Fx_display_pixel_width, Fx_display_pixel_height)
  (compute_tip_xy): Use x_display_pixel_width, x_display_pixel_height.

diff -r 1f7d70f80eb9 -r 5f73593cabcd src/ChangeLog
--- a/src/ChangeLog	Fri Sep 19 06:20:30 2008 +0000
+++ b/src/ChangeLog	Fri Sep 19 08:44:14 2008 +0000
@@ -1,3 +1,10 @@
+2008-09-19  Juanma Barranquero  <lekktu@gmail.com>
+
+	* frame.c (x_fullscreen_adjust): Declare var as Display_Info.
+
+	* w32fns.c (Fx_display_pixel_width, Fx_display_pixel_height)
+	(compute_tip_xy): Use x_display_pixel_width, x_display_pixel_height.
+
 2008-09-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* dispextern.h (struct it): Move line_wrap away from the middle of
diff -r 1f7d70f80eb9 -r 5f73593cabcd src/frame.c
--- a/src/frame.c	Fri Sep 19 06:20:30 2008 +0000
+++ b/src/frame.c	Fri Sep 19 08:44:14 2008 +0000
@@ -2862,7 +2862,7 @@
 {
   int newwidth = FRAME_COLS (f);
   int newheight = FRAME_LINES (f);
-  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+  Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 
   *top_pos = f->top_pos;
   *left_pos = f->left_pos;
diff -r 1f7d70f80eb9 -r 5f73593cabcd src/w32fns.c
--- a/src/w32fns.c	Fri Sep 19 06:20:30 2008 +0000
+++ b/src/w32fns.c	Fri Sep 19 08:44:14 2008 +0000
@@ -4628,7 +4628,7 @@
 {
   struct w32_display_info *dpyinfo = check_x_display_info (display);
 
-  return make_number (dpyinfo->width);
+  return make_number (x_display_pixel_width (dpyinfo));
 }
 
 DEFUN ("x-display-pixel-height", Fx_display_pixel_height,
@@ -4642,7 +4642,7 @@
 {
   struct w32_display_info *dpyinfo = check_x_display_info (display);
 
-  return make_number (dpyinfo->height);
+  return make_number (x_display_pixel_height (dpyinfo));
 }
 
 DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes,
@@ -5597,8 +5597,8 @@
       /* Default min and max values.  */
       min_x = 0;
       min_y = 0;
-      max_x = FRAME_W32_DISPLAY_INFO (f)->width;
-      max_y = FRAME_W32_DISPLAY_INFO (f)->height;
+      max_x = x_display_pixel_width (FRAME_W32_DISPLAY_INFO (f));
+      max_y = x_display_pixel_height (FRAME_W32_DISPLAY_INFO (f));
 
       BLOCK_INPUT;
       GetCursorPos (&pt);