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

[Dmitry Antipov]

------------------------------------------------------------
revno: 117254
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-04 07:20:11 +0400
message:
  * lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit
  fields conditionally.
modified:
  lwlib/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-1447
  lwlib/lwlib-widget.h           lwlibwidget.h-20140603195004-gozo82ue13z21nui-1

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2014-06-03 19:59:55 +0000
+++ b/lwlib/ChangeLog   2014-06-04 03:20:11 +0000
@@ -1,3 +1,8 @@
+2014-06-04  Dmitry Antipov  <address@hidden>
+
+       * lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit
+       fields conditionally.
+
 2014-06-03  Paul Eggert  <address@hidden>
 
        Do not require libXt-devel when building with gtk.

=== modified file 'lwlib/lwlib-widget.h'
--- a/lwlib/lwlib-widget.h      2014-06-03 19:59:55 +0000
+++ b/lwlib/lwlib-widget.h      2014-06-04 03:20:11 +0000
@@ -73,13 +73,6 @@
   /* 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 @@
   /* 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