diff options
| author | Miles Bader <[email protected]> | 2007-08-29 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-08-29 05:28:10 +0000 |
| commit | 8d9cc0b7ea1893059df8788129998e9a71ec07f3 (patch) | |
| tree | 4caa326ed8de37c8c0a859c7071593362832d37e /src/gtkutil.c | |
| parent | cb5b9015b372175f1fc90cb7ba3f43298c621509 (diff) | |
| parent | 5142de65ce179e846514ec7355274ab22822a85c (diff) | |
Merge multi-tty branch
Revision: [email protected]/emacs--devo--0--patch-866
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 9fb011de91..2af1e03cc2 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -874,7 +874,7 @@ xg_create_frame_widgets (f) /* Since GTK clears its window by filling with the background color, we must keep X and GTK background in sync. */ - xg_pix_to_gcolor (wfixed, f->output_data.x->background_pixel, &bg); + xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg); gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg); /* Also, do not let any background pixmap to be set, this looks very @@ -2043,7 +2043,7 @@ xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) return w; } -/* Callback called when keyboard traversal (started by menu-bar-open) ends. +/* Callback called when keyboard traversal (started by x-menu-bar-open) ends. WMENU is the menu for which traversal has been done. DATA points to the frame for WMENU. We must release grabs, some bad interaction between GTK and Emacs makes the menus keep the grabs. */ |