comparison src/event-msw.c @ 5126:2a462149bd6a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 19:04:27 -0600
parents d0c14ea98592
children 8b2f75cecb89
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
1 /* The mswindows event_stream interface. 1 /* The mswindows event_stream interface.
2 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 1996, 2000, 2001, 2002, 2003, 2005 Ben Wing. 4 Copyright (C) 1996, 2000, 2001, 2002, 2003, 2005, 2010 Ben Wing.
5 Copyright (C) 1997 Jonathan Harris. 5 Copyright (C) 1997 Jonathan Harris.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
3384 { 3384 {
3385 GetClientRect (hwnd, &rect); 3385 GetClientRect (hwnd, &rect);
3386 FRAME_PIXWIDTH (frame) = rect.right; 3386 FRAME_PIXWIDTH (frame) = rect.right;
3387 FRAME_PIXHEIGHT (frame) = rect.bottom; 3387 FRAME_PIXHEIGHT (frame) = rect.bottom;
3388 3388
3389 pixel_to_real_char_size (frame, rect.right, rect.bottom, 3389 pixel_to_frame_unit_size (frame, rect.right, rect.bottom, &columns,
3390 &FRAME_MSWINDOWS_CHARWIDTH (frame),
3391 &FRAME_MSWINDOWS_CHARHEIGHT (frame));
3392
3393 pixel_to_char_size (frame, rect.right, rect.bottom, &columns,
3394 &rows); 3390 &rows);
3395 change_frame_size (frame, rows, columns, 1); 3391 change_frame_size (frame, columns, rows, 1);
3396 3392
3397 /* If we are inside frame creation, we have to apply geometric 3393 /* If we are inside frame creation, we have to apply geometric
3398 properties now. */ 3394 properties now. */
3399 if (FRAME_MSWINDOWS_TARGET_RECT (frame)) 3395 if (FRAME_MSWINDOWS_TARGET_RECT (frame))
3400 { 3396 {
3475 int pixwidth, pixheight; 3471 int pixwidth, pixheight;
3476 AdjustWindowRectEx (&ncsize, qxeGetWindowLong (hwnd, GWL_STYLE), 3472 AdjustWindowRectEx (&ncsize, qxeGetWindowLong (hwnd, GWL_STYLE),
3477 GetMenu(hwnd) != NULL, 3473 GetMenu(hwnd) != NULL,
3478 qxeGetWindowLong (hwnd, GWL_EXSTYLE)); 3474 qxeGetWindowLong (hwnd, GWL_EXSTYLE));
3479 3475
3480 round_size_to_real_char (XFRAME (mswindows_find_frame (hwnd)), 3476 round_size_to_char (XFRAME (mswindows_find_frame (hwnd)),
3481 wp->cx - (ncsize.right - ncsize.left), 3477 wp->cx - (ncsize.right - ncsize.left),
3482 wp->cy - (ncsize.bottom - ncsize.top), 3478 wp->cy - (ncsize.bottom - ncsize.top),
3483 &pixwidth, &pixheight); 3479 &pixwidth, &pixheight);
3484 3480
3485 /* Convert client sizes to window sizes */ 3481 /* Convert client sizes to window sizes */