* lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit

fields conditionally.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index daf47ce4720f87efc9d8a96af583549c7628b9a2..5a5d1e703fd30b7b1fd157a97a482db737087feb 100644 (file)
--- 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 b5abb1af9fa00c49cbf87fed8651a8fa32660581..8901964ff559d5880e670d137bb022627b4e7691 100644 (file)
--- 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