Commit 70360d0c authored by Miles Bader's avatar Miles Bader
Browse files

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <>

   * Relicense all FSF files to GPLv3 or later.

2007-07-24  Jason Rumney  <>

   * src/w32fns.c (x_real_positions): Get real position from OS instead of
   calculating it.

parents c07bb40b ef2805c2
......@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
......@@ -436,20 +436,21 @@ x_real_positions (f, xptr, yptr)
RECT rect;
GetClientRect(FRAME_W32_WINDOW(f), &rect);
AdjustWindowRect(&rect, f->output_data.w32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f));
/* Get the bounds of the WM window. */
GetWindowRect (FRAME_W32_WINDOW (f), &rect);
pt.x = rect.left;
pt.y =;
pt.x = 0;
pt.y = 0;
ClientToScreen (FRAME_W32_WINDOW(f), &pt);
/* Convert (0, 0) in the client area to screen co-ordinates. */
ClientToScreen (FRAME_W32_WINDOW (f), &pt);
/* Remember x_pixels_diff and y_pixels_diff. */
f->x_pixels_diff = pt.x - rect.left;
f->y_pixels_diff = pt.y -;
*xptr = pt.x;
*yptr = pt.y;
*xptr = rect.left;
*yptr =;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment