Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
5051:c3d372419e09 5052:92dc90c0bb40
322 int rows; 322 int rows;
323 XtWidgetGeometry req, repl; 323 XtWidgetGeometry req, repl;
324 324
325 update_various_frame_slots (ew); 325 update_various_frame_slots (ew);
326 326
327 pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows); 327 pixel_to_frame_unit_size (f, ew->core.width, ew->core.height, &columns, &rows);
328 change_frame_size (f, rows, columns, 0); 328 change_frame_size (f, columns, rows, 0);
329 329
330 /* The code below is just plain wrong. If the EmacsShell or EmacsManager 330 /* The code below is just plain wrong. If the EmacsShell or EmacsManager
331 needs to know, they should just ask. If needed information is being 331 needs to know, they should just ask. If needed information is being
332 updated here, then we should set a dirty flag and have it updated on an 332 updated here, then we should set a dirty flag and have it updated on an
333 as-needed basis. 333 as-needed basis.
589 int cw, ch; 589 int cw, ch;
590 struct frame *f = ew->emacs_frame.frame; 590 struct frame *f = ew->emacs_frame.frame;
591 591
592 assert (XtIsSubclass (w, emacsFrameClass)); 592 assert (XtIsSubclass (w, emacsFrameClass));
593 593
594 default_face_height_and_width (wrap_frame (f), &ch, &cw); 594 default_face_width_and_height (wrap_frame (f), &cw, &ch);
595 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) 595 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
596 x_wm_set_cell_size (FRAME_X_SHELL_WIDGET (f), cw, ch); 596 x_wm_set_cell_size (FRAME_X_SHELL_WIDGET (f), cw, ch);
597 } 597 }
598 598
599 /* Set the size of the widget to have the number of rows and columns 599 /* Set the size of the widget to have the number of rows and columns