Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_border.c ewl_border.h ewl_check.h ewl_datepicker.c
ewl_label.h ewl_menu.h ewl_menu_base.c ewl_menu_base.h
ewl_menu_item.c ewl_menu_item.h ewl_shadow.h ewl_spinner.c
ewl_spinner.h
Log Message:
- formatting, const fixes, warning fixes
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_border.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_border.c 30 Jun 2006 00:33:09 -0000 1.13
+++ ewl_border.c 16 Nov 2006 22:09:00 -0000 1.14
@@ -19,7 +19,10 @@
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
- ewl_border_init(b);
+ if (!ewl_border_init(b)) {
+ ewl_widget_destroy(EWL_WIDGET(b));
+ b = NULL;
+ }
DRETURN_PTR(EWL_WIDGET(b), DLEVEL_STABLE);
}
@@ -74,7 +77,7 @@
* Change the text of the border label to the string @a t.
*/
void
-ewl_border_text_set(Ewl_Border * b, char *t)
+ewl_border_text_set(Ewl_Border *b, const char *t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("b", b);
@@ -90,8 +93,8 @@
* @return Returns the border label text on success, NULL on failure.
* @brief Get the text label from a border widget
*/
-char *
-ewl_border_text_get(Ewl_Border * b)
+const char *
+ewl_border_text_get(Ewl_Border *b)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("b", b, NULL);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_border.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_border.h 15 Mar 2006 04:03:48 -0000 1.9
+++ ewl_border.h 16 Nov 2006 22:09:00 -0000 1.10
@@ -32,29 +32,29 @@
#define EWL_BORDER(border) ((Ewl_Border *) border)
/**
- * @brief Inherits from Ewl_Container to allow drawing a border and label
+ * @brief Inherits from Ewl_Box to allow drawing a border and label
* decoration around widgets.
*/
struct Ewl_Border
{
- Ewl_Box box; /**< Inherit from Ewl_Box */
- Ewl_Widget *label; /**< Text label for the border */
- Ewl_Widget *body; /**< Box for holding children */
- Ewl_Position label_position; /**< Flags for placing the label */
+ Ewl_Box box; /**< Inherit from Ewl_Box */
+ Ewl_Widget *label; /**< Text label for the border */
+ Ewl_Widget *body; /**< Box for holding children */
+ Ewl_Position label_position; /**< Flags for placing the label */
};
-Ewl_Widget *ewl_border_new(void);
-int ewl_border_init(Ewl_Border * b);
+Ewl_Widget *ewl_border_new(void);
+int ewl_border_init(Ewl_Border * b);
-void ewl_border_text_set(Ewl_Border * b, char *t);
-char *ewl_border_text_get(Ewl_Border * b);
+void ewl_border_text_set(Ewl_Border *b, const char *t);
+const char *ewl_border_text_get(Ewl_Border *b);
-void ewl_border_label_position_set(Ewl_Border *b, Ewl_Position pos);
-Ewl_Position ewl_border_label_position_get(Ewl_Border *b);
+void ewl_border_label_position_set(Ewl_Border *b, Ewl_Position pos);
+Ewl_Position ewl_border_label_position_get(Ewl_Border *b);
-void ewl_border_label_alignment_set(Ewl_Border *b,
+void ewl_border_label_alignment_set(Ewl_Border *b,
unsigned int align);
-unsigned int ewl_border_label_alignment_get(Ewl_Border *b);
+unsigned int ewl_border_label_alignment_get(Ewl_Border *b);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_check.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_check.h 30 Sep 2006 18:41:01 -0000 1.12
+++ ewl_check.h 16 Nov 2006 22:09:00 -0000 1.13
@@ -32,7 +32,7 @@
#define EWL_CHECK(c) ((Ewl_Check *)c)
/**
- * Inherits from Ewl_Check and extends it to provide a checked state.
+ * Inherits from Ewl_Widget and extends it to provide a checked state.
*/
struct Ewl_Check
{
@@ -40,18 +40,17 @@
int checked; /**< Indicates if this is checked */
};
-Ewl_Widget *ewl_check_new(void);
-int ewl_check_init(Ewl_Check *c);
-int ewl_check_is_checked(Ewl_Check *c);
-void ewl_check_checked_set(Ewl_Check *c, int checked);
+Ewl_Widget *ewl_check_new(void);
+int ewl_check_init(Ewl_Check *c);
+
+int ewl_check_is_checked(Ewl_Check *c);
+void ewl_check_checked_set(Ewl_Check *c, int checked);
/*
* Internally used callbacks.
*/
-void ewl_check_cb_clicked(Ewl_Widget *w, void *ev_data,
- void *user_data);
-void ewl_check_cb_update_check(Ewl_Widget *w, void *ev_data,
- void *user_data);
+void ewl_check_cb_clicked(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_check_cb_update_check(Ewl_Widget *w, void *ev_data, void *user_data);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_datepicker.c 16 Nov 2006 19:13:46 -0000 1.16
+++ ewl_datepicker.c 16 Nov 2006 22:09:00 -0000 1.17
@@ -144,7 +144,7 @@
*/
void
ewl_datepicker_cb_window_mouse_down(Ewl_Widget *w, void *ev __UNUSED__,
- void *user_data)
+ void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_label.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_label.h 10 Sep 2006 15:54:44 -0000 1.13
+++ ewl_label.h 16 Nov 2006 22:09:00 -0000 1.14
@@ -37,13 +37,13 @@
Ewl_Widget widget; /**< Inherit from Ewl_Widget */
};
-Ewl_Widget *ewl_label_new(void);
-int ewl_label_init(Ewl_Label *la);
+Ewl_Widget *ewl_label_new(void);
+int ewl_label_init(Ewl_Label *la);
-void ewl_label_text_set(Ewl_Label *la, const char *text);
-const char *ewl_label_text_get(Ewl_Label *la);
+void ewl_label_text_set(Ewl_Label *la, const char *text);
+const char *ewl_label_text_get(Ewl_Label *la);
-Ewl_View *ewl_label_view_get(void);
+Ewl_View *ewl_label_view_get(void);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_menu.h 5 Nov 2006 22:08:22 -0000 1.17
+++ ewl_menu.h 16 Nov 2006 22:09:00 -0000 1.18
@@ -39,7 +39,7 @@
{
Ewl_Menu_Base base; /**< Inherit from Ewl_Menu_Base */
- Ewl_Widget *menubar_parent; /**< Parent menu bar */
+ Ewl_Widget *menubar_parent; /**< Parent menu bar */
};
Ewl_Widget *ewl_menu_new(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu_base.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_menu_base.c 30 Sep 2006 18:41:01 -0000 1.20
+++ ewl_menu_base.c 16 Nov 2006 22:09:00 -0000 1.21
@@ -31,10 +31,6 @@
ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN,
ewl_menu_base_cb_expand, NULL);
- /*ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_OUT,
- ewl_menu_base_cb_collapse, NULL);*/
-
-
ewl_callback_prepend(EWL_WIDGET(menu), EWL_CALLBACK_DESTROY,
ewl_menu_base_cb_destroy, NULL);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu_base.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_menu_base.h 30 Sep 2006 18:41:01 -0000 1.12
+++ ewl_menu_base.h 16 Nov 2006 22:09:00 -0000 1.13
@@ -36,10 +36,10 @@
*/
struct Ewl_Menu_Base
{
- Ewl_Menu_Item item; /**< Inherit from Ewl_Menu_Item */
- Ewl_Widget *popup; /**< The popup portion of the menu */
- Ewl_Widget *popbox; /**< Box for layout in popup */
- int hold; /**< Indicates not to hide this on a deselect */
+ Ewl_Menu_Item item; /**< Inherit from Ewl_Menu_Item */
+ Ewl_Widget *popup; /**< The popup portion of the menu */
+ Ewl_Widget *popbox; /**< Box for layout in popup */
+ int hold; /**< Indicates not to hide this on a deselect */
};
int ewl_menu_base_init(Ewl_Menu_Base *menu);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu_item.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_menu_item.c 30 Sep 2006 18:41:01 -0000 1.13
+++ ewl_menu_item.c 16 Nov 2006 22:09:00 -0000 1.14
@@ -43,7 +43,6 @@
if (!ewl_button_init(EWL_BUTTON(item)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
-// ewl_box_orientation_set(EWL_BOX(item), EWL_ORIENTATION_HORIZONTAL);
ewl_button_fill_policy_set(EWL_BUTTON(item), EWL_FLAG_FILL_HFILL);
ewl_button_alignment_set(EWL_BUTTON(item), EWL_FLAG_ALIGN_LEFT);
ewl_button_label_set(EWL_BUTTON(item), "");
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu_item.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_menu_item.h 30 Sep 2006 18:41:01 -0000 1.11
+++ ewl_menu_item.h 16 Nov 2006 22:09:00 -0000 1.12
@@ -37,8 +37,8 @@
*/
struct Ewl_Menu_Item
{
- Ewl_Button button; /**< Inherit from Ewl_Button */
- Ewl_Widget *inmenu; /**< Set if inside a menu */
+ Ewl_Button button; /**< Inherit from Ewl_Button */
+ Ewl_Widget *inmenu; /**< Set if inside a menu */
};
Ewl_Widget *ewl_menu_item_new(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_shadow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_shadow.h 26 Sep 2006 18:02:44 -0000 1.3
+++ ewl_shadow.h 16 Nov 2006 22:09:00 -0000 1.4
@@ -32,7 +32,7 @@
#define EWL_SHADOW(shadow) ((Ewl_Shadow *) shadow)
/**
- * @brief Inherits from Ewl_Container to allow drawing a border and shadow
+ * @brief Inherits from Ewl_Box to allow drawing a border and shadow
* decoration around widgets.
*/
struct Ewl_Shadow
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spinner.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_spinner.c 2 Oct 2006 05:19:24 -0000 1.24
+++ ewl_spinner.c 16 Nov 2006 22:09:00 -0000 1.25
@@ -247,10 +247,8 @@
pvw = ewl_object_preferred_w_get(EWL_OBJECT(s->vbox));
- ewl_object_place(EWL_OBJECT(s->vbox), cx + cw - pvw, cy, pvw,
- ch);
- ewl_object_place(EWL_OBJECT(s->entry), cx, cy, cw - pvw,
- ch);
+ ewl_object_place(EWL_OBJECT(s->vbox), cx + cw - pvw, cy, pvw, ch);
+ ewl_object_place(EWL_OBJECT(s->entry), cx, cy, cw - pvw, ch);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -342,8 +340,8 @@
if (str && strlen(str)) {
val = atof(str);
-
ewl_range_value_set(EWL_RANGE(s), (double) (val));
+
} else if (str)
FREE(str);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spinner.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_spinner.h 30 Sep 2006 18:41:01 -0000 1.14
+++ ewl_spinner.h 16 Nov 2006 22:09:00 -0000 1.15
@@ -38,23 +38,23 @@
*/
struct Ewl_Spinner
{
- Ewl_Range range; /**< Inherit from Ewl_Range */
- unsigned char digits; /**< Number of digits displayed after decimal */
- Ewl_Widget *entry; /**< The Ewl_Entry displaying value */
- Ewl_Widget *vbox; /**< Ewl_Box to hold the buttons */
- Ewl_Widget *increment; /**< Ewl_Button to add value */
- Ewl_Widget *decrement; /**< Ewl_Button to subtract value */
- double start_time; /**< Time the spinner was pressed */
- double last_value; /**< The last value while spinning */
- int direction; /**< Indicate increasing/decreasing value */
- Ecore_Timer *timer; /**< Timer for tracking mouse button held down */
+ Ewl_Range range; /**< Inherit from Ewl_Range */
+ unsigned char digits; /**< Number of digits displayed after decimal */
+ Ewl_Widget *entry; /**< The Ewl_Entry displaying value */
+ Ewl_Widget *vbox; /**< Ewl_Box to hold the buttons */
+ Ewl_Widget *increment; /**< Ewl_Button to add value */
+ Ewl_Widget *decrement; /**< Ewl_Button to subtract value */
+ double start_time; /**< Time the spinner was pressed */
+ double last_value; /**< The last value while spinning */
+ int direction; /**< Indicate increasing/decreasing value */
+ Ecore_Timer *timer; /**< Timer for tracking mouse button held down
*/
};
-Ewl_Widget *ewl_spinner_new(void);
-int ewl_spinner_init(Ewl_Spinner *s);
+Ewl_Widget *ewl_spinner_new(void);
+int ewl_spinner_init(Ewl_Spinner *s);
-void ewl_spinner_digits_set(Ewl_Spinner *s, unsigned char digits);
-unsigned char ewl_spinner_digits_get(Ewl_Spinner *s);
+void ewl_spinner_digits_set(Ewl_Spinner *s, unsigned char digits);
+unsigned char ewl_spinner_digits_get(Ewl_Spinner *s);
/*
* Internally used callbacks, override at your own risk.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
