# HG changeset patch # User Kim F. Storm # Date 1047471146 0 # Node ID a62497b91c74fed47dbe6c0b1a96fd91e841eaa9 # Parent 0b192c622b66d0f06352d1c38056fe4491547799 Use generic compute_fringe_widths. diff -r 0b192c622b66 -r a62497b91c74 src/gtkutil.c --- a/src/gtkutil.c Wed Mar 12 12:11:00 2003 +0000 +++ b/src/gtkutil.c Wed Mar 12 12:12:26 2003 +0000 @@ -345,7 +345,7 @@ : (FRAME_SCROLL_BAR_COLS (f) * 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, but not rows/cols. */ diff -r 0b192c622b66 -r a62497b91c74 src/macfns.c --- a/src/macfns.c Wed Mar 12 12:11:00 2003 +0000 +++ b/src/macfns.c Wed Mar 12 12:12:26 2003 +0000 @@ -3534,7 +3534,7 @@ ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) : (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_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); diff -r 0b192c622b66 -r a62497b91c74 src/w32fns.c --- a/src/w32fns.c Wed Mar 12 12:11:00 2003 +0000 +++ b/src/w32fns.c Wed Mar 12 12:12:26 2003 +0000 @@ -60,7 +60,6 @@ static void init_external_image_libraries (); extern void free_frame_menubar (); -extern void x_compute_fringe_widths P_ ((struct frame *, int)); extern double atof (); extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object)); extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT)); @@ -2521,7 +2520,7 @@ struct frame *f; Lisp_Object new_value, old_value; { - x_compute_fringe_widths (f, 1); + compute_fringe_widths (f, 1); } void @@ -3336,7 +3335,7 @@ ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) : (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_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); diff -r 0b192c622b66 -r a62497b91c74 src/widget.c --- a/src/widget.c Wed Mar 12 12:11:00 2003 +0000 +++ b/src/widget.c Wed Mar 12 12:12:26 2003 +0000 @@ -434,7 +434,7 @@ : (FRAME_SCROLL_BAR_COLS (frame) * 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 out the frame to Lisp code before it officially exists. @@ -915,7 +915,7 @@ ? 0 : (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); diff -r 0b192c622b66 -r a62497b91c74 src/xfns.c --- a/src/xfns.c Wed Mar 12 12:11:00 2003 +0000 +++ b/src/xfns.c Wed Mar 12 12:12:26 2003 +0000 @@ -2057,7 +2057,7 @@ struct frame *f; Lisp_Object new_value, old_value; { - x_compute_fringe_widths (f, 1); + compute_fringe_widths (f, 1); } void @@ -3329,7 +3329,7 @@ ? 0 : (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_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); diff -r 0b192c622b66 -r a62497b91c74 src/xterm.h --- a/src/xterm.h Wed Mar 12 12:11:00 2003 +0000 +++ b/src/xterm.h Wed Mar 12 12:12:26 2003 +0000 @@ -1062,7 +1062,6 @@ extern void x_uncatch_errors P_ ((Display *, int)); extern Lisp_Object x_new_font 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_window_size P_ ((struct frame *, int, int, int)); extern void x_set_mouse_position P_ ((struct frame *, int, int));