rnd-19990124-1

[rocksndiamonds.git] / src / buttons.h

diff --git a/src/buttons.h b/src/buttons.h
index f473b877439804a6b2c2187fee7b664aa2d26450..afbcfe8ce756e13bc69b861a2d735a056d6c6261 100644 (file)
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -276,14 +276,16 @@ int CheckCountButtons(int, int, int);
 
 /* gadget types */
 #define GD_TYPE_NORMAL_BUTTON          (1 << 0)
-#define GD_TYPE_RADIO_BUTTON           (1 << 1)
-#define GD_TYPE_DRAWING_AREA           (1 << 2)
-#define GD_TYPE_TEXTINPUT_ALPHANUMERIC (1 << 3)
-#define GD_TYPE_TEXTINPUT_NUMERIC      (1 << 4)
-#define GD_TYPE_SCROLLBAR_VERTICAL     (1 << 5)
-#define GD_TYPE_SCROLLBAR_HORIZONTAL   (1 << 6)
+#define GD_TYPE_CHECK_BUTTON           (1 << 1)
+#define GD_TYPE_RADIO_BUTTON           (1 << 2)
+#define GD_TYPE_DRAWING_AREA           (1 << 3)
+#define GD_TYPE_TEXTINPUT_ALPHANUMERIC (1 << 4)
+#define GD_TYPE_TEXTINPUT_NUMERIC      (1 << 5)
+#define GD_TYPE_SCROLLBAR_VERTICAL     (1 << 6)
+#define GD_TYPE_SCROLLBAR_HORIZONTAL   (1 << 7)
 
 #define GD_TYPE_BUTTON                 (GD_TYPE_NORMAL_BUTTON | \
+                                        GD_TYPE_CHECK_BUTTON | \
                                         GD_TYPE_RADIO_BUTTON)
 #define GD_TYPE_SCROLLBAR              (GD_TYPE_SCROLLBAR_VERTICAL | \
                                         GD_TYPE_SCROLLBAR_HORIZONTAL)
@@ -305,6 +307,7 @@ int CheckCountButtons(int, int, int);
 
 /* gadget structure constants */
 #define MAX_GADGET_TEXTSIZE            1024
+#define MAX_INFO_TEXTSIZE              1024
 
 /* gadget creation tags */
 #define GDI_END                                0
@@ -315,8 +318,8 @@ int CheckCountButtons(int, int, int);
 #define GDI_HEIGHT                     5
 #define GDI_TYPE                       6
 #define GDI_STATE                      7
-#define GDI_RADIO_NR                   8
-#define GDI_RADIO_PRESSED              9
+#define GDI_CHECKED                    8
+#define GDI_RADIO_NR                   9
 #define GDI_NUMBER_VALUE               10
 #define GDI_NUMBER_MIN                 11
 #define GDI_NUMBER_MAX                 12
@@ -336,7 +339,7 @@ int CheckCountButtons(int, int, int);
 #define GDI_SCROLLBAR_ITEMS_MAX                26
 #define GDI_SCROLLBAR_ITEMS_VISIBLE    27
 #define GDI_SCROLLBAR_ITEM_POSITION    28
-#define GDI_DESCRIPTION_TEXT           29
+#define GDI_INFO_TEXT                  29
 
 typedef void (*gadget_function)(void *);
 
@@ -387,13 +390,13 @@ struct GadgetInfo
 {
   int id;                              /* internal gadget identifier */
   int custom_id;                       /* custom gadget identifier */
-  char *description_text;              /* short text describing gadget */
+  char info_text[MAX_INFO_TEXTSIZE];   /* short popup info text */
   int x, y;                            /* gadget position */
   int width, height;                   /* gadget size */
   unsigned long type;                  /* type (button, text input, ...) */
   unsigned long state;                 /* state (pressed, released, ...) */
+  boolean checked;                     /* check/radio button state */
   int radio_nr;                                /* number of radio button series */
-  boolean radio_pressed;               /* radio button state */
   boolean mapped;                      /* gadget is active */
   struct GadgetDesign design[2];       /* 0: normal; 1: pressed */
   struct GadgetDesign alt_design[2];   /* alternative design */