Commit 055d3c98 authored by Kim F. Storm's avatar Kim F. Storm

Use generic compute_fringe_widths.

parent ffbbc941
...@@ -345,7 +345,7 @@ xg_frame_set_char_size (f, cols, rows) ...@@ -345,7 +345,7 @@ xg_frame_set_char_size (f, cols, rows)
: (FRAME_SCROLL_BAR_COLS (f) : (FRAME_SCROLL_BAR_COLS (f)
* FONT_WIDTH (f->output_data.x->font))); * FONT_WIDTH (f->output_data.x->font)));
x_compute_fringe_widths (f, 0); compute_fringe_widths (f, 0);
/* Must resize our top level widget. Font size may have changed, /* Must resize our top level widget. Font size may have changed,
but not rows/cols. */ but not rows/cols. */
......
...@@ -3534,7 +3534,7 @@ x_figure_window_size (f, parms) ...@@ -3534,7 +3534,7 @@ x_figure_window_size (f, parms)
? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
: (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.mac->font))); : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.mac->font)));
x_compute_fringe_widths (f, 0); compute_fringe_widths (f, 0);
f->output_data.mac->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width); f->output_data.mac->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
f->output_data.mac->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); f->output_data.mac->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
......
...@@ -60,7 +60,6 @@ void globals_of_w32fns (); ...@@ -60,7 +60,6 @@ void globals_of_w32fns ();
static void init_external_image_libraries (); static void init_external_image_libraries ();
extern void free_frame_menubar (); extern void free_frame_menubar ();
extern void x_compute_fringe_widths P_ ((struct frame *, int));
extern double atof (); extern double atof ();
extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object)); extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object));
extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT)); extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT));
...@@ -2521,7 +2520,7 @@ x_set_fringe_width (f, new_value, old_value) ...@@ -2521,7 +2520,7 @@ x_set_fringe_width (f, new_value, old_value)
struct frame *f; struct frame *f;
Lisp_Object new_value, old_value; Lisp_Object new_value, old_value;
{ {
x_compute_fringe_widths (f, 1); compute_fringe_widths (f, 1);
} }
void void
...@@ -3336,7 +3335,7 @@ x_figure_window_size (f, parms) ...@@ -3336,7 +3335,7 @@ x_figure_window_size (f, parms)
? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
: (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font))); : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));
x_compute_fringe_widths (f, 0); compute_fringe_widths (f, 0);
f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width); f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
......
...@@ -434,7 +434,7 @@ set_frame_size (ew) ...@@ -434,7 +434,7 @@ set_frame_size (ew)
: (FRAME_SCROLL_BAR_COLS (frame) : (FRAME_SCROLL_BAR_COLS (frame)
* FONT_WIDTH (frame->output_data.x->font))); * FONT_WIDTH (frame->output_data.x->font)));
x_compute_fringe_widths (frame, 0); compute_fringe_widths (frame, 0);
#if 0 /* This can run Lisp code, and it is dangerous to give #if 0 /* This can run Lisp code, and it is dangerous to give
out the frame to Lisp code before it officially exists. out the frame to Lisp code before it officially exists.
...@@ -915,7 +915,7 @@ EmacsFrameSetCharSize (widget, columns, rows) ...@@ -915,7 +915,7 @@ EmacsFrameSetCharSize (widget, columns, rows)
? 0 ? 0
: (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font))); : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
x_compute_fringe_widths (f, 0); compute_fringe_widths (f, 0);
char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height); char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height);
......
...@@ -2057,7 +2057,7 @@ x_set_fringe_width (f, new_value, old_value) ...@@ -2057,7 +2057,7 @@ x_set_fringe_width (f, new_value, old_value)
struct frame *f; struct frame *f;
Lisp_Object new_value, old_value; Lisp_Object new_value, old_value;
{ {
x_compute_fringe_widths (f, 1); compute_fringe_widths (f, 1);
} }
void void
...@@ -3329,7 +3329,7 @@ x_figure_window_size (f, parms) ...@@ -3329,7 +3329,7 @@ x_figure_window_size (f, parms)
? 0 ? 0
: (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font))); : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
x_compute_fringe_widths (f, 0); compute_fringe_widths (f, 0);
f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width); f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
......
...@@ -1062,7 +1062,6 @@ extern int x_had_errors_p P_ ((Display *)); ...@@ -1062,7 +1062,6 @@ extern int x_had_errors_p P_ ((Display *));
extern void x_uncatch_errors P_ ((Display *, int)); extern void x_uncatch_errors P_ ((Display *, int));
extern Lisp_Object x_new_font P_ ((struct frame *, char *)); extern Lisp_Object x_new_font P_ ((struct frame *, char *));
extern Lisp_Object x_new_fontset P_ ((struct frame *, char *)); extern Lisp_Object x_new_fontset P_ ((struct frame *, char *));
extern void x_compute_fringe_widths P_ ((struct frame *, int));
extern void x_set_offset P_ ((struct frame *, int, int, int)); extern void x_set_offset P_ ((struct frame *, int, int, int));
extern void x_set_window_size P_ ((struct frame *, int, int, int)); extern void x_set_window_size P_ ((struct frame *, int, int, int));
extern void x_set_mouse_position P_ ((struct frame *, int, int)); extern void x_set_mouse_position P_ ((struct frame *, int, int));
......
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