From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 11 Dec 2004 21:12:45 +0000 (+0000)
Subject: * w32term.c (x_calc_absolute_position): Remove calculation of
X-Git-Tag: ttn-vms-21-2-B4~3328
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f25767f5ee08b28ac555eb34e8d294b9e0e675d;p=emacs.git

* w32term.c (x_calc_absolute_position): Remove calculation of
difference between inner and outer window.  Don't subtract difference
for left and top calculations.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3352ef3cd22..1cfb8e7d5a9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+	* w32term.c (x_calc_absolute_position): Remove calculation of
+	difference between inner and outer window.  Don't subtract difference
+	for left and top calculations.
+
 	* xterm.c (x_calc_absolute_position): Don't subtract outer_pixel_diff
 	for left and top calculations.  Remove call to x_real_positions.
 	(x_check_expected_move): Do not set change_gravity to 1 when calling
diff --git a/src/w32term.c b/src/w32term.c
index 5edfd5536e7..6e17b22ec5b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5374,47 +5374,17 @@ void
 x_calc_absolute_position (f)
      struct frame *f;
 {
-  POINT pt;
   int flags = f->size_hint_flags;
 
-  pt.x = pt.y = 0;
-
-  /* Find the position of the outside upper-left corner of
-     the inner window, with respect to the outer window.
-     But do this only if we will need the results.  */
-  if (f->output_data.w32->parent_desc != FRAME_W32_DISPLAY_INFO (f)->root_window)
-    {
-      BLOCK_INPUT;
-      MapWindowPoints (FRAME_W32_WINDOW (f),
-		       f->output_data.w32->parent_desc,
-		       &pt, 1);
-      UNBLOCK_INPUT;
-    }
-
-  {
-      RECT rt;
-      rt.left = rt.right = rt.top = rt.bottom = 0;
-
-      BLOCK_INPUT;
-      AdjustWindowRect(&rt, f->output_data.w32->dwStyle,
-		       FRAME_EXTERNAL_MENU_BAR (f));
-      UNBLOCK_INPUT;
-
-      pt.x += (rt.right - rt.left);
-      pt.y += (rt.bottom - rt.top);
-  }
-
   /* Treat negative positions as relative to the leftmost bottommost
      position that fits on the screen.  */
   if (flags & XNegative)
     f->left_pos = (FRAME_W32_DISPLAY_INFO (f)->width
-		   - 2 * f->border_width - pt.x
 		   - FRAME_PIXEL_WIDTH (f)
 		   + f->left_pos);
 
   if (flags & YNegative)
     f->top_pos = (FRAME_W32_DISPLAY_INFO (f)->height
-		  - 2 * f->border_width - pt.y
 		  - FRAME_PIXEL_HEIGHT (f)
 		  + f->top_pos);
   /* The left_pos and top_pos