Mercurial > hg > xemacs-beta

diff src/msw-proc.c @ 217:d44af0c54775 r20-4b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b7
author cvs
date Mon, 13 Aug 2007 10:08:34 +0200
parents 78f53ef88e17
children 262b8bb4a523
line wrap: on
line diff
--- a/src/msw-proc.c	Mon Aug 13 10:07:42 2007 +0200
+++ b/src/msw-proc.c	Mon Aug 13 10:08:34 2007 +0200
@@ -396,6 +396,7 @@
     struct frame *f = request->thing1;
     Lisp_Object *props = request->thing2;
     Lisp_Object name, height, width, popup, top, left;
+    int pixel_width, pixel_height;
     RECT rect;
     DWORD style;
     HWND hwnd;
@@ -409,9 +410,11 @@
 
     style = (NILP(popup)) ? MSWINDOWS_FRAME_STYLE : MSWINDOWS_POPUP_STYLE;
 
+    /* The +1 is because there is no msw-glyph.c yet. */
+    char_to_pixel_size (f, 80+1, 24+1, &pixel_width, &pixel_height);
     rect.left = rect.top = 0;
-    rect.right = INTP(width) ? XINT(width) : 640;
-    rect.bottom = INTP(height) ? XINT(height) : 480;
+    rect.right = INTP(width) ? XINT(width) : pixel_width;
+    rect.bottom = INTP(height) ? XINT(height) : pixel_height;
 #ifdef HAVE_MENUBARS
     AdjustWindowRect(&rect, style, TRUE);
 #else