diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-03 12:59:55 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-03 12:59:55 -0700 |
commit | 181f08a7d8378c5d3cb290b58c7618396413d28c (patch) | |
tree | d36524ab6287a64f552897cfe3f1c8e2bce14213 /lwlib/lwlib.h | |
parent | 5897da1d746561c63719b21c5984b49a194f8209 (diff) | |
download | emacs-181f08a7d8378c5d3cb290b58c7618396413d28c.tar.gz |
Do not require libXt-devel when building with gtk.
* lwlib/lwlib-widget.h: New file, with contents taken from lwlib.h.
(widget_value) [HAVE_NTGUI]: New member 'title'.
* lwlib/lwlib.h: Include lwlib-widget.h.
(change_type, enum button_type, widget_value):
Move to lwlib-widget.h.
* src/gtkutil.h, src/menu.h: Include lwlib-widget.h, not lwlib-h, to avoid
dependency on libXt-devel.
* src/menu.h [HAVE_NTGUI]: Include lwlib-widget.h in this case too.
(enum button_type, widget_value) [HAVE_NTGUI]: Remove, as
lwlib-widget.h now does this.
* src/nsmenu.m (ns_menu_show): "enabled" -> "enable" to fix typo.
Diffstat (limited to 'lwlib/lwlib.h')
-rw-r--r-- | lwlib/lwlib.h | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index 563ade8b34d..46e2d7a4891 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -42,22 +42,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ** main: ("name") */ -typedef unsigned long LWLIB_ID; - -typedef enum _change_type -{ - NO_CHANGE = 0, - INVISIBLE_CHANGE = 1, - VISIBLE_CHANGE = 2, - STRUCTURAL_CHANGE = 3 -} change_type; +#include "lwlib-widget.h" -enum button_type -{ - BUTTON_TYPE_NONE, - BUTTON_TYPE_TOGGLE, - BUTTON_TYPE_RADIO -}; +typedef unsigned long LWLIB_ID; /* Menu separator types. */ @@ -81,46 +68,6 @@ enum menu_separator SEPARATOR_SHADOW_DOUBLE_ETCHED_OUT_DASH }; -typedef struct _widget_value -{ - /* name of widget */ - Lisp_Object lname; - char* name; - /* value (meaning depend on widget type) */ - char* value; - /* keyboard equivalent. no implications for XtTranslations */ - Lisp_Object lkey; - char* key; - /* Help string or nil if none. - GC finds this string through the frame's menu_bar_vector - or through menu_items. */ - Lisp_Object help; - /* true if enabled */ - Boolean enabled; - /* true if selected */ - Boolean selected; - /* true if was edited (maintained by get_value) */ - Boolean edited; - /* The type of a button. */ - enum button_type button_type; - /* true if has changed (maintained by lw library) */ - change_type change; - /* true if this widget itself has changed, - but not counting the other widgets found in the `next' field. */ - change_type this_one_change; - /* Contents of the sub-widgets, also selected slot for checkbox */ - struct _widget_value* contents; - /* data passed to callback */ - XtPointer call_data; - /* next one in the list */ - struct _widget_value* next; - /* slot for the toolkit dependent part. Always initialize to NULL. */ - void* toolkit_data; - /* tell us if we should free the toolkit data slot when freeing the - widget_value itself. */ - Boolean free_toolkit_data; -} widget_value; - typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data); |