Mercurial > hg > xemacs-beta
view lwlib/xlwmenuP.h @ 5091:ed624ab64583
fix compile errors/warnings
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-03-02 Ben Wing <ben@xemacs.org>
* digest-doc.c:
* make-path.c:
`emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get
config.h.
* getopt.h:
Conditionalize on HAVE_CONFIG_H to get real prototypes.
src/ChangeLog addition:
2010-03-02 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* Makefile.in.in (objs):
glyphs-shared.o, glyphs-eimage.o only needed when HAVE_WINDOW_SYSTEM.
glyphs-widget.o should be too, but we need a bit of work ifdeffing
out the subwindow stuff from redisplay.c et al.
* bytecode.c (init_opcode_table_multi_op):
Change var name to avoid shadowing with `basename'.
* emacs.c (main_1):
Don't call init/etc. routines for glyphs-shared, glyphs-eimage unless
HAVE_WINDOW_SYSTEM is defined.
* linuxplay.c:
* linuxplay.c (sighandler):
* vdb-posix.c (vdb_fault_handler):
Use const for variables holding string constants to avoid C++
warnings.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Tue, 02 Mar 2010 05:22:10 -0600 |
parents | a6c778975d7d |
children | ade4c7e2c6cb |
line wrap: on
line source
#ifndef INCLUDED_xlwmenuP_h_ #define INCLUDED_xlwmenuP_h_ #include "xlwmenu.h" #include <X11/CoreP.h> #ifdef HAVE_XFT_MENUBARS #include <X11/Xft/Xft.h> #endif /* Elements in the stack arrays. */ typedef struct _window_state { Window window; Position x; Position y; Dimension width; Dimension height; Dimension label_width; Dimension toggle_width; } window_state; /* New fields for the XlwMenu widget instance record */ typedef struct _XlwMenu_part { /* slots set by the resources */ #if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS) XmFontList font_list; XmFontList font_list_2; XmFontList fallback_font_list; #else XFontStruct * font; #ifdef HAVE_XFT_MENUBARS String fcFontName; String xftFontName; XftFont *renderFont; #endif # ifdef USE_XFONTSET XFontSet font_set; # endif #endif Dimension font_ascent, font_descent; /* extracted from font/fontlist */ Pixel foreground; Pixel button_foreground; Pixel highlight_foreground; Pixel title_foreground; Dimension margin; Dimension horizontal_margin; Dimension vertical_margin; Dimension column_spacing; Dimension shadow_thickness; Dimension indicator_size; Pixel top_shadow_color; Pixel bottom_shadow_color; Pixel select_color; #ifdef HAVE_XFT_MENUBARS #endif Pixmap top_shadow_pixmap; Pixmap bottom_shadow_pixmap; Cursor cursor_shape; XtCallbackList open; XtCallbackList select; widget_value* contents; int horizontal; Boolean use_backing_store; Boolean bounce_down; Boolean lookup_labels; /* State of the XlwMenu */ int old_depth; widget_value** old_stack; int old_stack_length; /* New state after the user moved */ int new_depth; widget_value** new_stack; int new_stack_length; /* Window resources */ window_state* windows; int windows_length; /* Internal part, set by the XlwMenu */ GC foreground_gc; GC button_gc; GC background_gc; GC inactive_gc; GC inactive_button_gc; GC shadow_top_gc; GC shadow_bottom_gc; GC select_gc; GC highlight_gc; GC title_gc; Cursor cursor; Boolean popped_up; Pixmap gray_pixmap; /* Stay-up stuff */ Boolean pointer_grabbed; Boolean next_release_must_exit; Time menu_post_time, menu_bounce_time; widget_value * last_selected_val; } XlwMenuPart; /* Full instance record declaration */ typedef struct _XlwMenuRec { CorePart core; XlwMenuPart menu; } XlwMenuRec; /* New fields for the XlwMenu widget class record */ typedef struct { int dummy; } XlwMenuClassPart; /* Full class record declaration. */ typedef struct _XlwMenuClassRec { CoreClassPart core_class; XlwMenuClassPart menu_class; } XlwMenuClassRec; /* Class pointer. */ extern XlwMenuClassRec xlwMenuClassRec; #endif /* INCLUDED_xlwmenuP_h_ */