Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
        ewl_imenu.c ewl_imenu.h ewl_menu_base.c ewl_menu_base.h 
        ewl_widget.c 


Log Message:
Cleaned out a few unused menu fields. Added some FIXME's that will be necessary
when edje themes are phased in.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_imenu.c 3 Jun 2003 04:00:45 -0000       1.7
+++ ewl_imenu.c 30 Jun 2003 05:58:59 -0000      1.8
@@ -55,36 +55,6 @@
 }
 
 
-/**
- * ewl_imenu_set_title_expandable - allow title to be expanded/contracted
- * @menu: the menu
- *
- * Returns nothing.
- */
-void ewl_imenu_set_title_expandable(Ewl_IMenu * menu)
-{
-
-       DENTER_FUNCTION(DLEVEL_STABLE);
-
-       menu->t_expand = 1;
-
-       /*
-        * ewl_object_set_maximum_size (EWL_OBJECT(menu->corner), 30, 22);
-        * ewl_object_set_minimum_size (EWL_OBJECT(menu->corner), 30, 22);
-        */
-
-       /*
-        * ewl_callback_append(menu->corner_button, EWL_CALLBACK_MOUSE_UP,
-        * __ewl_imenu_expand, menu);
-        * ewl_container_append_child(EWL_CONTAINER(menu->corner), 
-        * menu->corner_button);
-        * 
-        * ewl_widget_configure(EWL_WIDGET(menu->corner));
-        */
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
 void __ewl_imenu_expand(Ewl_Widget * w, void *ev_data, void *user_data)
 {
        Ewl_IMenu      *menu;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_imenu.h 25 May 2002 05:46:40 -0000      1.2
+++ ewl_imenu.h 30 Jun 2003 05:58:59 -0000      1.3
@@ -7,6 +7,4 @@
 Ewl_Widget     *ewl_imenu_new(char *image, char *title);
 void            ewl_imenu_init(Ewl_IMenu * menu, char *image, char *title);
 
-void            ewl_imenu_set_title_expandable(Ewl_IMenu * m);
-
 #endif                         /* __EWL_IMENU_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_menu_base.c     26 Jun 2003 04:38:15 -0000      1.12
+++ ewl_menu_base.c     30 Jun 2003 05:58:59 -0000      1.13
@@ -47,11 +47,6 @@
         */
        ewl_container_add_notify(EWL_CONTAINER(menu), __ewl_menu_add);
 
-       /*
-        * Initialize the remaining fields of the menu.
-        */
-       menu->t_expand = 0;
-
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_menu_base.h     23 Jun 2003 05:59:19 -0000      1.3
+++ ewl_menu_base.h     30 Jun 2003 05:58:59 -0000      1.4
@@ -56,15 +56,6 @@
         */
        Ewl_Widget     *popup;
        Ewl_Widget     *popbox;
-
-       /*
-        * boolean: is title collapsed or expanded
-        */
-       int             t_expand;
-
-       /* animation variables */
-       int             width;
-       int             height;
 };
 
 Ewl_Widget     *ewl_menu_item_new(char *image, char *title);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_widget.c        29 Apr 2003 20:19:36 -0000      1.58
+++ ewl_widget.c        30 Jun 2003 05:58:59 -0000      1.59
@@ -35,6 +35,10 @@
                                     void *user_data);
 static void     __ewl_widget_mouse_up(Ewl_Widget * w, void *ev_data,
                                     void *user_data);
+/* FIXME: Enable with Edje
+static void     __ewl_widget_mouse_move(Ewl_Widget * w, void *ev_data,
+                                    void *user_data);
+ */
 
 static inline void __ewl_widget_ebits_destroy(Ewl_Widget *w);
 static inline void __ewl_widget_cleanup_fx_clip(Ewl_Widget *w);
@@ -100,6 +104,11 @@
                            NULL);
        ewl_callback_append(w, EWL_CALLBACK_MOUSE_UP, __ewl_widget_mouse_up,
                            NULL);
+       /*
+        * FIXME: Enable this when edje themes are used
+       ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, __ewl_widget_mouse_move,
+                           NULL);
+        */
 
        ewl_widget_set_appearance(w, appearance);
 
@@ -930,6 +939,17 @@
        } else
                ewl_widget_update_appearance(w, "normal");
 }
+
+/*
+ * FIXME: When edje thems are phased in, we must pass events on
+static void
+__ewl_widget_mouse_move(Ewl_Widget *w, void *ev_data, void *user_data)
+{
+       if (w->state & EWL_STATE_DISABLED)
+               DRETURN(DLEVEL_STABLE);
+
+}
+ */
 
 static inline void __ewl_widget_ebits_destroy(Ewl_Widget *w)
 {




-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to