Mercurial > hg > xemacs-beta

diff src/EmacsFrame.c @ 5052:92dc90c0bb40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 23:56:01 -0600
parents 6f2158fa75ed 07dcc7000bbf
children d372b17f63ce 8b2f75cecb89
line wrap: on
line diff
--- a/src/EmacsFrame.c	Sat Feb 20 18:57:55 2010 -0600
+++ b/src/EmacsFrame.c	Sat Feb 20 23:56:01 2010 -0600
@@ -324,8 +324,8 @@
 
   update_various_frame_slots (ew);
 
-  pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows);
-  change_frame_size (f, rows, columns, 0);
+  pixel_to_frame_unit_size (f, ew->core.width, ew->core.height, &columns, &rows);
+  change_frame_size (f, columns, rows, 0);
 
   /* The code below is just plain wrong.  If the EmacsShell or EmacsManager
      needs to know, they should just ask.  If needed information is being
@@ -591,7 +591,7 @@
 
   assert (XtIsSubclass (w, emacsFrameClass));
 
-  default_face_height_and_width (wrap_frame (f), &ch, &cw);
+  default_face_width_and_height (wrap_frame (f), &cw, &ch);
   if (FRAME_X_TOP_LEVEL_FRAME_P (f))
     x_wm_set_cell_size (FRAME_X_SHELL_WIDGET (f), cw, ch);
 }