diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-13 19:03:51 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-13 19:03:51 +0400 |
| commit | aad3612f9eb7280bd4db8ee697186e75b1e82765 (patch) | |
| tree | fd251b7978e9a570a6b66c93a43b0021bac0c7b7 /src/gtkutil.c | |
| parent | 7830899f39515bcb4938715ebf58d1ba855deb41 (diff) | |
Unify FRAME_window_system_DISPLAY_INFO macros between all ports.
All of them are replaced with FRAME_DISPLAY_INFO, defined in
each port to reference the port-specific window system data.
* msdos.h (FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define.
* w32term.h (FRAME_W32_DISPLAY_INFO, FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define. Adjust users.
* xterm.h (FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define. Adjust users.
* frame.h (FRAME_RES_X, FRAME_RES_Y): Unify.
* font.c, frame.c, gtkutil.c, image.c, menu.c, msdos.c, nsfns.m:
* nsfont.m, nsterm.m, w32fns.c, w32font.c, w32menu.c, w32term.c:
* w32xfns.c, widget.c, xdisp.c, xfaces.c, xfns.c, xfont.c, xmenu.c:
* xselect.c, xterm.c: All related users changed.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 6228f2150f..064145282b 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2737,7 +2737,7 @@ xg_create_widget (const char *type, const char *name, struct frame *f, { /* Must realize so the GdkWindow inside the widget is created. */ gtk_widget_realize (w); - xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor); + xg_set_cursor (w, FRAME_DISPLAY_INFO (f)->xg_cursor); } } else @@ -3676,7 +3676,7 @@ xg_create_scroll_bar (struct frame *f, /* Set the cursor to an arrow. */ - xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor); + xg_set_cursor (webox, FRAME_DISPLAY_INFO (f)->xg_cursor); bar->x_window = scroll_id; } @@ -3972,7 +3972,7 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data) /* Convert between the modifier bits GDK uses and the modifier bits Emacs uses. This assumes GDK and X masks are the same, which they are when this is written. */ - event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod); + event.modifiers = x_x_to_emacs_modifiers (FRAME_DISPLAY_INFO (f), mod); kbd_buffer_store_event (&event); /* Return focus to the frame after we have clicked on a detached |