Enlightenment CVS committal
Author : lok
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
etk_toolbar.c etk_toolbar.h
Log Message:
[Toolbar] **API Break** An Etk_Box_Group parameter is to add to any
append/prepend/insert on a toolbar now.
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_toolbar.c 29 Jun 2007 09:14:01 -0000 1.12
+++ etk_toolbar.c 13 Jul 2007 23:57:29 -0000 1.13
@@ -83,11 +83,11 @@
* @param toolbar a toolbar
* @param widget the item to append
*/
-void etk_toolbar_append(Etk_Toolbar *toolbar, Etk_Widget *widget)
+void etk_toolbar_append(Etk_Toolbar *toolbar, Etk_Widget *widget,
Etk_Box_Group group)
{
if (!toolbar || !widget)
return;
- etk_box_append(ETK_BOX(toolbar->box), widget, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_box_append(ETK_BOX(toolbar->box), widget, group, ETK_BOX_NONE, 0);
}
/**
@@ -95,11 +95,11 @@
* @param toolbar a toolbar
* @param widget the item to append
*/
-void etk_toolbar_prepend(Etk_Toolbar *toolbar, Etk_Widget *widget)
+void etk_toolbar_prepend(Etk_Toolbar *toolbar, Etk_Widget *widget,
Etk_Box_Group group)
{
if (!toolbar || !widget)
return;
- etk_box_prepend(ETK_BOX(toolbar->box), widget, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_box_prepend(ETK_BOX(toolbar->box), widget, group, ETK_BOX_NONE, 0);
}
/**
@@ -108,11 +108,11 @@
* @param widget the item to add
* @param pos the position to add the item at
*/
-void etk_toolbar_insert_at(Etk_Toolbar *toolbar, Etk_Widget *widget, int pos)
+void etk_toolbar_insert_at(Etk_Toolbar *toolbar, Etk_Widget *widget,
Etk_Box_Group group, int pos)
{
if (!toolbar || !widget)
return;
- etk_box_insert_at(ETK_BOX(toolbar->box), widget, ETK_BOX_START, pos,
ETK_BOX_NONE, 0);
+ etk_box_insert_at(ETK_BOX(toolbar->box), widget, group, pos, ETK_BOX_NONE,
0);
}
/**
@@ -144,7 +144,7 @@
children = etk_container_children_get(ETK_CONTAINER(prev_box));
for (l = children; l; l = l->next)
- etk_toolbar_append(toolbar, ETK_WIDGET(l->data));
+ etk_toolbar_append(toolbar, ETK_WIDGET(l->data), ETK_BOX_START);
evas_list_free(children);
etk_object_destroy(ETK_OBJECT(prev_box));
@@ -373,7 +373,7 @@
if (!(toolbar = ETK_TOOLBAR(container)) || !widget)
return;
- etk_toolbar_append(toolbar, widget);
+ etk_toolbar_append(toolbar, widget, ETK_BOX_START);
}
/* Removes the child from the toolbar */
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toolbar.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_toolbar.h 29 Jun 2007 09:14:01 -0000 1.8
+++ etk_toolbar.h 13 Jul 2007 23:57:29 -0000 1.9
@@ -5,6 +5,7 @@
#include "etk_container.h"
#include "etk_stock.h"
#include "etk_types.h"
+#include "etk_box.h"
/* TODO/FIXME list:
* - When the toolbar is too large, we should clip it and add a popup-menu for
the clipped tool-items
@@ -64,9 +65,9 @@
Etk_Type *etk_toolbar_type_get(void);
Etk_Widget *etk_toolbar_new(void);
-void etk_toolbar_append(Etk_Toolbar *toolbar, Etk_Widget *widget);
-void etk_toolbar_prepend(Etk_Toolbar *toolbar, Etk_Widget *widget);
-void etk_toolbar_insert_at(Etk_Toolbar *toolbar, Etk_Widget *widget, int pos);
+void etk_toolbar_append(Etk_Toolbar *toolbar, Etk_Widget *widget,
Etk_Box_Group group);
+void etk_toolbar_prepend(Etk_Toolbar *toolbar, Etk_Widget *widget,
Etk_Box_Group group);
+void etk_toolbar_insert_at(Etk_Toolbar *toolbar, Etk_Widget *widget,
Etk_Box_Group group, int pos);
void etk_toolbar_orientation_set(Etk_Toolbar *toolbar,
Etk_Toolbar_Orientation orientation);
Etk_Toolbar_Orientation etk_toolbar_orientation_get(Etk_Toolbar *toolbar);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
