Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_object.h ewl_paned.c ewl_widget.h
Log Message:
- properly bracket defines in ewl_object.h
- fixup warnings in ewl_paned.c
- remove all of the comments before funcs in ewl_widget.h these are all
doc'd in the ewl_widget.c file.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_object.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_object.h 25 Oct 2005 00:36:57 -0000 1.3
+++ ewl_object.h 30 Nov 2005 04:33:32 -0000 1.4
@@ -282,21 +282,27 @@
#define MINIMUM_H(o) EWL_OBJECT(o)->minimum.h
#define ewl_object_custom_size_set(o, w, h) \
- ewl_object_minimum_size_set(o, w, h); \
- ewl_object_maximum_size_set(o, w, h); \
- ewl_object_fill_policy_set(o, EWL_FLAG_FILL_NONE);
+ { \
+ ewl_object_minimum_size_set(o, w, h); \
+ ewl_object_maximum_size_set(o, w, h); \
+ ewl_object_fill_policy_set(o, EWL_FLAG_FILL_NONE); \
+ }
#define ewl_object_custom_w_set(o, w) \
- ewl_object_maximum_w_set(o, w); \
- ewl_object_minimum_w_set(o, w); \
- ewl_object_fill_policy_set(o, ewl_object_fill_policy_get(o) & \
- ~(EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK));
+ { \
+ ewl_object_maximum_w_set(o, w); \
+ ewl_object_minimum_w_set(o, w); \
+ ewl_object_fill_policy_set(o, ewl_object_fill_policy_get(o) & \
+ ~(EWL_FLAG_FILL_HFILL |
EWL_FLAG_FILL_HSHRINK)); \
+ }
#define ewl_object_custom_h_set(o, h) \
- ewl_object_maximum_h_set(o, h); \
- ewl_object_minimum_h_set(o, h); \
- ewl_object_fill_policy_set(o, ewl_object_fill_policy_get(o) & \
- ~(EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_VSHRINK));
+ { \
+ ewl_object_maximum_h_set(o, h); \
+ ewl_object_minimum_h_set(o, h); \
+ ewl_object_fill_policy_set(o, ewl_object_fill_policy_get(o) & \
+ ~(EWL_FLAG_FILL_VFILL |
EWL_FLAG_FILL_VSHRINK)); \
+ }
/**
* @def RECURSIVE(o)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_paned.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_paned.c 30 Nov 2005 03:32:45 -0000 1.9
+++ ewl_paned.c 30 Nov 2005 04:33:32 -0000 1.10
@@ -139,16 +139,13 @@
ewl_widget_appearance_set(EWL_WIDGET(p->first), "first");
ewl_widget_appearance_set(EWL_WIDGET(p->second), "second");
- /*Looks like we only do horizontally-split panes right now*/
- ewl_object_fill_policy_set(p->second, EWL_FLAG_FILL_NORMAL);
- ewl_object_fill_policy_set(p->first, EWL_FLAG_FILL_HSHRINK |
EWL_FLAG_FILL_VFILL );
+ /* Looks like we only do horizontally-split panes right now */
+ ewl_object_fill_policy_set(EWL_OBJECT(p->second), EWL_FLAG_FILL_NORMAL);
+ ewl_object_fill_policy_set(EWL_OBJECT(p->first),
+ EWL_FLAG_FILL_HSHRINK |
EWL_FLAG_FILL_VFILL );
ewl_object_fill_policy_set(EWL_OBJECT(p), EWL_FLAG_FILL_NORMAL);
-
-
- // ewl_widget_appearance_set(EWL_WIDGET(p->grabber),
"grabber_horizontal");
- /*ewl_object_fill_policy_set(EWL_OBJECT(p),
- EWL_FLAG_FILL_HSHRINK |
EWL_FLAG_FILL_VFILL);*/
+ /* ewl_widget_appearance_set(EWL_WIDGET(p->grabber),
"grabber_horizontal"); */
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_widget.h 29 Nov 2005 17:00:58 -0000 1.21
+++ ewl_widget.h 30 Nov 2005 04:33:32 -0000 1.22
@@ -98,149 +98,47 @@
Ecore_Hash *data; /**< Arbitrary data attached to widget */
};
-/*
- * Initialize a widget to it's default values
- */
int ewl_widget_init(Ewl_Widget * w);
-/*
- * Assign the given name to a widget
- */
void ewl_widget_name_set(Ewl_Widget * w, const char *name);
-
-/*
- * Retrieve the given name of a widget
- */
const char * ewl_widget_name_get(Ewl_Widget * w);
-
-/*
- * Find the widget identified by a given name.
- */
Ewl_Widget * ewl_widget_name_find(const char *name);
-/*
- * Signal the widget that it's parent has changed.
- */
void ewl_widget_reparent(Ewl_Widget * widget);
-
-/*
- * Realize the appearance of the widget.
- */
void ewl_widget_realize(Ewl_Widget * widget);
-
-/*
- * Unrealize the appearance of the widget.
- */
void ewl_widget_unrealize(Ewl_Widget * w);
-
-/*
- * Mark the widget to be revealed.
- */
void ewl_widget_reveal(Ewl_Widget *w);
-
-/*
- * Mark the widget to be obscured.
- */
void ewl_widget_obscure(Ewl_Widget *w);
-
-/*
- * Mark the widget to be displayed.
- */
void ewl_widget_show(Ewl_Widget * widget);
-
-/*
- * Mark the widget to be hidden.
- */
void ewl_widget_hide(Ewl_Widget * widget);
-
-/*
- * Free the widget and all ot its contained data.
- */
void ewl_widget_destroy(Ewl_Widget * widget);
-
-/*
- * Queue the widget to be configured.
- */
void ewl_widget_configure(Ewl_Widget * widget);
-/*
- * Update the widget's appearance based on it's theme data.
- */
void ewl_widget_theme_update(Ewl_Widget * w);
-/*
- * Attach a key/value pair to a widget.
- */
void ewl_widget_data_set(Ewl_Widget * w, void *k, void *v);
-
-/*
- * Remove a key value pair from a widget.
- */
void *ewl_widget_data_del(Ewl_Widget * w, void *k);
-
-/*
- * Retrieve a key value pair from a widget.
- */
void *ewl_widget_data_get(Ewl_Widget * w, void *k);
-/*
- * Change the appearance of a widget based on a state string.
- */
void ewl_widget_state_set(Ewl_Widget * w, char *state);
-/*
- * Change the appearance string used for determining the correct theme data.
- */
void ewl_widget_appearance_set(Ewl_Widget * w, char *appearance);
-
-/*
- * Retrieve the appearance string of a widget.
- */
char *ewl_widget_appearance_get(Ewl_Widget * w);
-
-/*
- * Retrieve the full appearance string of the widget.
- */
char *ewl_widget_appearance_path_get(Ewl_Widget * w);
-
-/*
- * Change the text of the given theme part of a widget.
- */
-void ewl_widget_appearance_part_text_set(Ewl_Widget * w, char *part,
+void ewl_widget_appearance_part_text_set(Ewl_Widget * w, char *part,
char *text);
+void ewl_widget_appearance_text_set(Ewl_Widget * w, char *text);
-/*
- * Change the text of the theme-defined theme part of a widget.
- */
-void ewl_widget_appearance_text_set(Ewl_Widget * w, char *text);
-
-/*
- * Append to the inherited string
- */
void ewl_widget_inherit(Ewl_Widget *widget, char *type);
unsigned int ewl_widget_type_is(Ewl_Widget *widget, char *type);
-
unsigned int ewl_widget_onscreen_is(Ewl_Widget *widget);
-/*
- * Change the parent of a widget.
- */
void ewl_widget_parent_set(Ewl_Widget * w, Ewl_Widget * p);
-/*
- * Activate a widget.
- */
void ewl_widget_enable(Ewl_Widget * w);
-
-/*
- * Deactivate a widget.
- */
void ewl_widget_disable(Ewl_Widget * w);
-/*
- * Notify a widget to rebuild it's appearance string.
- */
void ewl_widget_print_tree(Ewl_Widget *w);
void ewl_widget_print(Ewl_Widget *w);
@@ -255,7 +153,6 @@
unsigned int ewl_widget_clipped_is(Ewl_Widget *w);
void ewl_widget_focus_send(Ewl_Widget *w);
-
Ewl_Widget *ewl_widget_focused_get(void);
void ewl_widget_tab_order_append(Ewl_Widget *w);
@@ -268,54 +165,35 @@
void ewl_widget_ignore_focus_change_set(Ewl_Widget *w, unsigned int
val);
unsigned int ewl_widget_ignore_focus_change_get(Ewl_Widget *w);
-void ewl_widget_color_set(Ewl_Widget *w, int r, int g,
- int b, int a);
-void ewl_widget_color_get(Ewl_Widget *w, int *r, int *g,
- int *b, int *a);
+void ewl_widget_color_set(Ewl_Widget *w, int r, int g, int b, int
a);
+void ewl_widget_color_get(Ewl_Widget *w, int *r, int *g, int *b,
int *a);
/**
* @def LAYER(w)
* Used to retrieve the layer of a widget.
*/
-#define LAYER(w) EWL_WIDGET(w)->layer
+#define LAYER(w) (EWL_WIDGET(w)->layer)
/*
* Internally used callbacks, override at your own risk.
*/
-void ewl_widget_show_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_hide_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_reveal_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_obscure_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_realize_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_unrealize_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_configure_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_destroy_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_reparent_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_enable_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_disable_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_focus_in_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_focus_out_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_mouse_down_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_mouse_up_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_child_destroy_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_widget_mouse_move_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
+void ewl_widget_show_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_hide_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_reveal_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_obscure_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_unrealize_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_reparent_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_enable_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_disable_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_focus_in_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_focus_out_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_child_destroy_cb(Ewl_Widget *w, void *ev_data, void
*user_data);
+void ewl_widget_mouse_move_cb(Ewl_Widget *w, void *ev_data, void *user_data);
/**
* @}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
