Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : proto

Dir     : e17/proto/edje_cc


Modified Files:
        Etcher.h edje.y 


Log Message:
fix up enum names, make compile

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/Etcher.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Etcher.h    8 Sep 2004 02:07:02 -0000       1.2
+++ Etcher.h    8 Sep 2004 02:11:48 -0000       1.3
@@ -1,6 +1,8 @@
 #ifndef ETCHER_H
 #define ETCHER_H
 
+#include <Evas.h>
+
 typedef enum _Etcher_Image_Type Etcher_Image_Type;
 typedef enum _Etcher_Part_Type Etcher_Part_Type;
 typedef enum _Etcher_Text_Effect Etcher_Text_Effect;
@@ -24,7 +26,7 @@
   ETCHER_IMAGE_TYPE_LOSSY,
   ETCHER_IMAGE_TYPE_EXTERNAL
 
-}
+};
 
 enum _Etcher_Part_Type
 {
@@ -32,7 +34,7 @@
   ETCHER_PART_TYPE_TEXT,
   ETCHER_PART_TYPE_RECT,
   ETCHER_PART_TYPE_SWALLOW
-}
+};
 
 enum _Etcher_Text_Effect
 {
@@ -43,7 +45,7 @@
   ETCHER_TEXT_EFFECT_OUTLINE_SHADOW,
   ETCHER_TEXT_EFFECT_SOFT_SHADOW,
   ETCHER_TEXT_EFFECT_OUTLINE_SOFT_SHADOW
-}
+};
 
 enum _Etcher_Action
 {
@@ -54,7 +56,7 @@
   ETCHER_ACTION_DRAG_VAL_STEP,
   ETCHER_ACTION_DRAG_VAL_PAGE,
   ETCHER_ACTION_SCRIPT
-}
+};
 
 enum _Etcher_Transition
 {
@@ -62,20 +64,20 @@
   ETCHER_TRANSITION_SINUSOIDAL,
   ETCHER_TRANSITION_ACCELERATE,
   ETCHER_TRANSITION_DECELERATE
-}
+};
 
 struct _Etcher_File
 {
   Evas_List *images;
   Evas_List *fonts;
   
-}
+};
 
 struct _Etcher_Data
 {
   char *key;
   char *value;
-}
+};
 
 struct _Etcher_Image
 {
@@ -83,14 +85,14 @@
   char *path;
   Etcher_Image_Type type;
   double value;
-}
+};
 
 struct _Etcher_Font
 {
   char *name;
   char *font;
   char *path;
-}
+};
 
 struct _Etcher_Group
 {
@@ -99,7 +101,7 @@
 
   Evas_List *parts;
   Evas_List *programs;
-}
+};
 
 struct _Etcher_Part
 {
@@ -113,7 +115,7 @@
   /* FIXME dragables */
 
   Evas_List *states;
-}
+};
 
 struct _Etcher_Program 
 {
@@ -128,7 +130,7 @@
   Etcher_Action action;
   Etcher_Transition transition;
   
-}
+};
 
 struct _Etcher_Part_State
 {
@@ -173,7 +175,7 @@
   struct
   {
     int l, r, t, b;
-  }
+  };
 
   struct
   {
@@ -185,7 +187,7 @@
     double         pos_rel_x, pos_rel_y;
     int            pos_abs_x, pos_abs_y; 
     double         rel_x, rel_y; 
-    int            abs_x, rel_x; 
+    int            abs_x, abs_y; 
   } fill;
 
   struct
@@ -206,6 +208,6 @@
   } text;
 
 
-}
+};
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje.y      8 Sep 2004 02:04:00 -0000       1.8
+++ edje.y      8 Sep 2004 02:11:48 -0000       1.9
@@ -16,8 +16,8 @@
 %union {
        char *string;
        float val;
-       Etcher_Program_Actions prog_actions;
-       Etcher_Transition_Types transition_type;
+       Etcher_Action prog_actions;
+       Etcher_Transition transition_type;
 }
 
 %token STRING FLOAT
@@ -152,7 +152,7 @@
 
 action_type: SIGNAL_EMIT { $$ = ETCHER_ACTION_SIGNAL_EMIT; }
        | STATE_SET { $$ = ETCHER_ACTION_STATE_SET; }
-       | ACTION_STOP { $$ = ETCHER_ACTION_ACTION_STOP; }
+       | ACTION_STOP { $$ = ETCHER_ACTION_STOP; }
        | DRAG_VAL_SET { $$ = ETCHER_ACTION_DRAG_VAL_SET; }
        | DRAG_VAL_STEP { $$ = ETCHER_ACTION_DRAG_VAL_STEP; }
        | DRAG_VAL_PAGE { $$ = ETCHER_ACTION_DRAG_VAL_PAGE; }




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to