Mercurial > hg > xemacs-beta
view src/menubar.h @ 4916:a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
USE_XFT* -> HAVE_XFT*.
lwlib/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* lwlib-colors.c:
* lwlib-colors.h:
* lwlib-fonts.c:
* lwlib-fonts.h:
* xlwmenu.c:
* xlwmenu.c (xlwMenuResources):
* xlwmenu.c (x_xft_text_width):
* xlwmenu.c (label_button_draw):
* xlwmenu.c (push_button_size):
* xlwmenu.c (push_button_draw):
* xlwmenu.c (make_drawing_gcs):
* xlwmenu.c (extract_font_extents):
* xlwmenu.c (default_font_of_font_list):
* xlwmenu.c (XlwMenuInitialize):
* xlwmenu.c (XlwMenuDestroy):
* xlwmenu.c (XlwMenuSetValues):
* xlwmenuP.h:
* xlwmenuP.h (_XlwMenu_part):
* xlwtabs.c:
* xlwtabs.c (TabsInit):
* xlwtabs.c (TabsDestroy):
* xlwtabs.c (TabsSetValues):
* xlwtabs.c (DrawTab):
* xlwtabs.c (TabWidth):
* xlwtabs.c (TabsAllocFgGC):
* xlwtabs.c (TabsAllocGreyGC):
* xlwtabsP.h:
USE_XFT* -> HAVE_XFT*.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* compiler.h:
* config.h.in:
* console-x-impl.h:
* console-x-impl.h (struct x_frame):
* console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P):
* console-x.h:
* console-xlike-inc.h:
* emacs.c (main_1):
* faces.c (complex_vars_of_faces):
* font-mgr.h:
* frame-x.c (x_delete_frame):
* frame-x.c (x_update_frame_external_traits):
* glyphs-x.c (update_widget_face):
* inline.c:
* objects-x-impl.h:
* objects-x-impl.h (struct x_color_instance_data):
* objects-x-impl.h (struct x_font_instance_data):
* objects-x.c:
* objects-x.c (x_initialize_color_instance):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_print_font_instance):
* objects-x.c (x_finalize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (vars_of_objects_x):
* objects-x.h:
USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and
redisplay-xlike-inc.c, continue to use USE_XFT, and define
it appropriately in console-xlike-inc.h when both HAVE_XFT
and THIS_IS_X -- even if HAVE_XFT, we don't want to enable
XFT code when included in a *-gtk.c file.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 22:00:29 -0600 |
parents | cd0abfdb9e9d |
children | 308d34e9f07d |
line wrap: on
line source
/* Define generic menubar support. Copyright (C) 1995 Board of Trustees, University of Illinois. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* #### Still needs some device-abstraction work. */ #ifndef INCLUDED_menubar_h_ #define INCLUDED_menubar_h_ #ifdef HAVE_MENUBARS #include "gui.h" void update_frame_menubars (struct frame *f); void free_frame_menubars (struct frame *f); Lisp_Object menu_parse_submenu_keywords (Lisp_Object desc, Lisp_Object gui_item); Lisp_Object current_frame_menubar (const struct frame *f); EXFUN (Fmenu_find_real_submenu, 2); extern Lisp_Object Vmenu_accelerator_prefix; extern Lisp_Object Vmenu_accelerator_modifiers; extern Lisp_Object Vmenu_accelerator_enabled; extern Lisp_Object Vmenu_accelerator_map; extern Lisp_Object Qmenu_force; extern Lisp_Object Qmenu_fallback; extern Lisp_Object Qmenu_quit; extern Lisp_Object Qmenu_up; extern Lisp_Object Qmenu_down; extern Lisp_Object Qmenu_left; extern Lisp_Object Qmenu_right; extern Lisp_Object Qmenu_select; extern Lisp_Object Qmenu_escape; /* #### kluuuuuuuuuuuuuuuuuuuuuuuuuuuudge! The author of the accelerator code didn't know what the hell he was doing. Someone needs to abstract this properly. */ #if defined (HAVE_X_WINDOWS) && defined (LWLIB_MENUBARS_LUCID) extern int x_kludge_lw_menu_active (void); struct command_builder; Lisp_Object command_builder_find_menu_accelerator (struct command_builder *builder); Lisp_Object command_builder_operate_menu_accelerator (struct command_builder *builder); #endif extern int popup_menu_up_p; extern int menubar_show_keybindings; extern int popup_menu_titles; extern int in_menu_callback; #endif /* HAVE_MENUBARS */ #endif /* INCLUDED_menubar_h_ */