diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-04 07:20:11 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-04 07:20:11 +0400 |
| commit | 39ec03147e88bb7a12d2e42edfa0206f6b7d546b (patch) | |
| tree | 0bf5f63a9a09240c0bfc987cea12a1e131dc682d /lwlib | |
| parent | 6348c9d718c322929b184fc17a778951345455d8 (diff) | |
| download | emacs-39ec03147e88bb7a12d2e42edfa0206f6b7d546b.tar.gz | |
* lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit
fields conditionally.
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 5 | ||||
| -rw-r--r-- | lwlib/lwlib-widget.h | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index daf47ce4720..5a5d1e703fd 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,8 @@ +2014-06-04 Dmitry Antipov <dmantipov@yandex.ru> + + * lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit + fields conditionally. + 2014-06-03 Paul Eggert <eggert@cs.ucla.edu> Do not require libXt-devel when building with gtk. diff --git a/lwlib/lwlib-widget.h b/lwlib/lwlib-widget.h index b5abb1af9fa..8901964ff55 100644 --- a/lwlib/lwlib-widget.h +++ b/lwlib/lwlib-widget.h @@ -73,13 +73,6 @@ typedef struct _widget_value /* The type of a button. */ enum button_type button_type; - /* Type of change (maintained by lw library). */ - change_type change; - - /* Type of this widget's change, 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; @@ -89,12 +82,22 @@ typedef struct _widget_value /* Next one in the list. */ struct _widget_value *next; +#ifdef USE_X_TOOLKIT + /* Type of change (maintained by lw library). */ + change_type change; + + /* Type of this widget's change, but not counting the other widgets + found in the `next' field. */ + change_type this_one_change; + /* Slot for the toolkit dependent part. Always initialize to NULL. */ void *toolkit_data; /* Whether we should free the toolkit data slot when freeing the widget_value itself. */ bool free_toolkit_data; +#endif + } widget_value; #endif |