* 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.

3 files changed, 12 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d6254c71cfa..ed40d242b3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/frame.c b/src/frame.c
index 50aae703f53..35b6417a71c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2862,7 +2862,7 @@ x_fullscreen_adjust (f, width, height, top_pos, left_pos)
 {
   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 --git a/src/w32fns.c b/src/w32fns.c
index c5c4d5d4688..3f9466c3d99 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4628,7 +4628,7 @@ If omitted or nil, that stands for the selected frame's display.  */)
 {
   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 @@ If omitted or nil, that stands for the selected frame's display.  */)
 {
   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 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
       /* 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);