diff gui/app.h @ 32911:e06fbdd8eb46

Clean up the wItem structure. Rearrange and group members, remove unused members and rename some members to be more informative and precise.

--- a/gui/app.h	Wed Mar 02 13:30:44 2011 +0000
+++ b/gui/app.h	Wed Mar 02 15:37:50 2011 +0000
@@ -105,7 +105,7 @@
 #define evFirstLoad       7005
 
 typedef struct {
-    int msg;
+    int message;
     const char *name;
 } evName;
 
@@ -133,14 +133,6 @@
     int x, y;
     int width, height;
 
-    int px, py, psx, psy;
-
-    int msg, msg2;
-    int pressed, tmp;
-    int key, key2;
-    int phases;
-    float value;
-
     txSample Bitmap;
     txSample Mask;
 
@@ -148,14 +140,20 @@
     int align;
     char *label;
 
+    int pwidth, pheight;
+    int numphases;
+    float value;
+
+    int message;
+
+    int R, G, B;
+
     char *text;
     int textwidth;
     unsigned int starttime;
     int last_x;
 
-    int event;
-
-    int R, G, B;
+    int pressed, tmp;
 } wItem;
 
 typedef struct {