Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c ewl_enums.h ewl_object.h ewl_widget.h
Log Message:
- move the in_tab_order over to be in the ewl flags mask.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- ewl_embed.c 15 Aug 2006 14:30:38 -0000 1.74
+++ ewl_embed.c 15 Aug 2006 15:06:51 -0000 1.75
@@ -1106,7 +1106,8 @@
current_idx = ecore_dlist_index(e->tab_order);
/* make sure this widget isn't already in the list */
- if (w->in_tab_order && ecore_dlist_goto(e->tab_order, w)) {
+ if (ewl_object_in_tab_list_get(EWL_OBJECT(w))
+ && ecore_dlist_goto(e->tab_order, w)) {
int del_idx;
/* if this widget was before or at our current focused
@@ -1125,7 +1126,7 @@
if (current_idx <= (int)idx) current_idx ++;
ecore_dlist_goto_index(e->tab_order, current_idx);
- w->in_tab_order = 1;
+ ewl_object_in_tab_list_set(EWL_OBJECT(w), TRUE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1219,8 +1220,8 @@
if (ecore_dlist_goto(e->tab_order, w))
ecore_dlist_remove(e->tab_order);
-
- w->in_tab_order = 0;
+
+ ewl_object_in_tab_list_set(EWL_OBJECT(w), FALSE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_enums.h 12 Jul 2006 03:44:19 -0000 1.50
+++ ewl_enums.h 15 Aug 2006 15:06:51 -0000 1.51
@@ -138,33 +138,33 @@
EWL_FLAG_PROPERTY_INTERNAL = 0x4000, /**< Widget is internal */
EWL_FLAG_PROPERTY_BLOCK_TAB_FOCUS = 0x8000, /**< Widget will block
tab focus changes */
EWL_FLAG_PROPERTY_FOCUSABLE = 0x10000, /**< Widget is focusable */
+ EWL_FLAG_PROPERTY_IN_TAB_LIST = 0x20000, /**< Widget is in the tab
order */
/*
* Flags to indicate queues this object is on.
*/
- EWL_FLAG_QUEUED_CSCHEDULED = 0x20000, /**< Configure scheduled */
- EWL_FLAG_QUEUED_RSCHEDULED = 0x40000, /**< Reveal scheduled */
- EWL_FLAG_QUEUED_DSCHEDULED = 0x80000, /**< Delete scheduled */
-
- EWL_FLAG_QUEUED_CPROCESS = 0x100000, /**< Configure in progress */
- EWL_FLAG_QUEUED_RPROCESS = 0x200000, /**< Reveal in progress */
- EWL_FLAG_QUEUED_DPROCESS = 0x400000, /**< Delete in progress */
+ EWL_FLAG_QUEUED_CSCHEDULED = 0x40000, /**< Configure scheduled */
+ EWL_FLAG_QUEUED_RSCHEDULED = 0x80000, /**< Reveal scheduled */
+ EWL_FLAG_QUEUED_DSCHEDULED = 0x100000, /**< Delete scheduled */
+
+ EWL_FLAG_QUEUED_CPROCESS = 0x200000, /**< Configure in progress */
+ EWL_FLAG_QUEUED_RPROCESS = 0x400000, /**< Reveal in progress */
+ EWL_FLAG_QUEUED_DPROCESS = 0x800000, /**< Delete in progress */
/*
* The state enum specifies the current state of a widget, ie. has it
* been clicked, does it have the keyboard focus, etc.
*/
EWL_FLAG_STATE_NORMAL = 0, /**< Widget state normal */
- EWL_FLAG_STATE_MOUSE_IN = 0x800000, /**< Mouse is in the widget */
- EWL_FLAG_STATE_PRESSED = 0x1000000, /**< Widget is pressed */
- EWL_FLAG_STATE_FOCUSED = 0x20000000, /**< Widget has focus */
- EWL_FLAG_STATE_DND = 0x4000000, /**< Widget is engaged in DND */
- EWL_FLAG_STATE_DISABLED = 0x8000000, /**< Widget is disabled */
-
- EWL_FLAG_PROPERTY_DND_AWARE = 0x10000000, /**< Widget is DND
aware */
- EWL_FLAG_PROPERTY_DRAGGABLE = 0x20000000, /**< Widget is dragable
*/
- EWL_FLAG_STATE_DND_WAIT = 0x40000000, /**< Widget is in DND
wait state */
-
+ EWL_FLAG_STATE_MOUSE_IN = 0x1000000, /**< Mouse is in the widget */
+ EWL_FLAG_STATE_PRESSED = 0x2000000, /**< Widget is pressed */
+ EWL_FLAG_STATE_FOCUSED = 0x40000000, /**< Widget has focus */
+ EWL_FLAG_STATE_DND = 0x8000000, /**< Widget is engaged in DND */
+ EWL_FLAG_STATE_DISABLED = 0x10000000, /**< Widget is disabled */
+
+ EWL_FLAG_PROPERTY_DND_AWARE = 0x20000000, /**< Widget is DND
aware */
+ EWL_FLAG_PROPERTY_DRAGGABLE = 0x40000000, /**< Widget is dragable
*/
+ EWL_FLAG_STATE_DND_WAIT = 0x80000000, /**< Widget is in DND
wait state */
};
/**
@@ -203,7 +203,8 @@
#define EWL_FLAGS_PROPERTY_MASK (EWL_FLAG_PROPERTY_RECURSIVE | \
EWL_FLAG_PROPERTY_TOPLEVEL | EWL_FLAG_PROPERTY_INTERNAL | \
EWL_FLAG_PROPERTY_BLOCK_TAB_FOCUS | EWL_FLAG_PROPERTY_FOCUSABLE
| \
- EWL_FLAG_PROPERTY_DND_AWARE | EWL_FLAG_PROPERTY_DRAGGABLE )
+ EWL_FLAG_PROPERTY_DND_AWARE | EWL_FLAG_PROPERTY_DRAGGABLE | \
+ EWL_FLAG_PROPERTY_IN_TAB_LIST)
/**
* @def EWL_FLAGS_QUEUED_MASK
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_object.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_object.h 27 May 2006 17:43:59 -0000 1.13
+++ ewl_object.h 15 Aug 2006 15:06:51 -0000 1.14
@@ -211,7 +211,7 @@
#define ewl_object_toplevel_set(o, val) \
(val ? ewl_object_flags_add(o, EWL_FLAG_PROPERTY_TOPLEVEL, \
EWL_FLAGS_PROPERTY_MASK) : \
- ewl_object_flags_remove(o, EWL_FLAG_PROPERTY_RECURSIVE, \
+ ewl_object_flags_remove(o, EWL_FLAG_PROPERTY_TOPLEVEL, \
EWL_FLAGS_PROPERTY_MASK));
/**
@@ -545,6 +545,29 @@
* Used to determine if a widget is disabled
*/
#define DISABLED(o) (ewl_object_state_has(EWL_OBJECT(o),
EWL_FLAG_STATE_DISABLED))
+
+/**
+ * @def ewl_object_in_tab_list_get(o)
+ * @param o: the parameter to retrieve the current value of the in tab list
flag
+ * @return Returns the current setting of the in tab list flag for @a o.
+ * @brief Retrieves the current setting of the in tab list flag for @a o.
+ */
+#define ewl_object_in_tab_list_get(o) \
+ (ewl_object_flags_get(o, EWL_FLAGS_PROPERTY_MASK) & \
+ EWL_FLAG_PROPERTY_IN_TAB_LIST)
+
+/**
+ * @def ewl_object_in_tab_list_set(o, val)
+ * @param o: the object to change the in tab list
+ * @param val: a boolean indicating the value of the tab list flag
+ * @return Returns no value.
+ * @brief Changes the tab list flag value to match @a val.
+ */
+#define ewl_object_in_tab_list_set(o, val) \
+ (val ? ewl_object_flags_add(o, EWL_FLAG_PROPERTY_IN_TAB_LIST, \
+ EWL_FLAGS_PROPERTY_MASK) : \
+ ewl_object_flags_remove(o, EWL_FLAG_PROPERTY_IN_TAB_LIST, \
+ EWL_FLAGS_PROPERTY_MASK));
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_widget.h 15 Aug 2006 14:30:38 -0000 1.45
+++ ewl_widget.h 15 Aug 2006 15:06:51 -0000 1.46
@@ -143,8 +143,6 @@
int layer; /**< the layer relative to the parent */
int toplayered; /**< Indicates if the widget should
be on the top of the layer
stack */
- unsigned char in_tab_order:1; /**< Has the widget been inserted
- into the tab order */
Ecore_Hash *theme; /**< Overriding theme settings */
Ewl_Pair_List theme_text; /**< Overriding text in theme */
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
