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  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

2007-07-24  Jason Rumney  <jasonr@gnu.org>

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

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
parents c07bb40b ef2805c2
...@@ -6,7 +6,7 @@ This file is part of GNU Emacs. ...@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify 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 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. any later version.
GNU Emacs is distributed in the hope that it will be useful, GNU Emacs is distributed in the hope that it will be useful,
...@@ -436,20 +436,21 @@ x_real_positions (f, xptr, yptr) ...@@ -436,20 +436,21 @@ x_real_positions (f, xptr, yptr)
POINT pt; POINT pt;
RECT rect; RECT rect;
GetClientRect(FRAME_W32_WINDOW(f), &rect); /* Get the bounds of the WM window. */
AdjustWindowRect(&rect, f->output_data.w32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f)); GetWindowRect (FRAME_W32_WINDOW (f), &rect);
pt.x = rect.left; pt.x = 0;
pt.y = rect.top; 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. */ /* Remember x_pixels_diff and y_pixels_diff. */
f->x_pixels_diff = pt.x - rect.left; f->x_pixels_diff = pt.x - rect.left;
f->y_pixels_diff = pt.y - rect.top; f->y_pixels_diff = pt.y - rect.top;
*xptr = pt.x; *xptr = rect.left;
*yptr = pt.y; *yptr = rect.top;
} }
......
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