Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_notebook.c etk_notebook.h etk_tree.c
Log Message:
* printf--
* Add 2 functions in the notebook API to change the child of a page or the
child of a tab
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_notebook.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_notebook.c 25 Dec 2005 23:48:10 -0000 1.4
+++ etk_notebook.c 26 Dec 2005 13:32:40 -0000 1.5
@@ -91,6 +91,25 @@
}
/* TODO */
+void etk_notebook_page_tab_widget_set(Etk_Notebook *notebook, int page_num,
Etk_Widget *tab_widget)
+{
+ Etk_Notebook_Page *page;
+
+ if (!notebook || !(page = evas_list_nth(notebook->pages, page_num)))
+ return;
+ etk_bin_child_set(ETK_BIN(page->tab), tab_widget);
+}
+
+void etk_notebook_page_child_set(Etk_Notebook *notebook, int page_num,
Etk_Widget *child)
+{
+ Etk_Notebook_Page *page;
+
+ if (!notebook || !(page = evas_list_nth(notebook->pages, page_num)))
+ return;
+ etk_bin_child_set(ETK_BIN(page->page_frame), child);
+}
+
+/* TODO */
void etk_notebook_current_page_set(Etk_Notebook *notebook, int page_num)
{
Etk_Notebook_Page *page;
@@ -325,9 +344,7 @@
etk_widget_visibility_locked_set(new_page->page_frame, TRUE);
etk_widget_hide(new_page->page_frame);
- new_page->page_widget = page_widget;
- if (new_page->page_widget)
- etk_bin_child_set(ETK_BIN(new_page->page_frame), new_page->page_widget);
+ etk_bin_child_set(ETK_BIN(new_page->page_frame), page_widget);
if (!notebook->current_page)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_notebook.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_notebook.h 25 Dec 2005 23:48:10 -0000 1.3
+++ etk_notebook.h 26 Dec 2005 13:32:40 -0000 1.4
@@ -22,7 +22,6 @@
typedef struct _Etk_Notebook_Page
{
Etk_Widget *tab;
- Etk_Widget *page_widget;
Etk_Widget *page_frame;
} Etk_Notebook_Page;
@@ -46,6 +45,9 @@
int etk_notebook_page_prepend(Etk_Notebook *notebook, const char *tab_label,
Etk_Widget *page_widget);
int etk_notebook_page_append(Etk_Notebook *notebook, const char *tab_label,
Etk_Widget *page_widget);
+void etk_notebook_page_tab_widget_set(Etk_Notebook *notebook, int page_num,
Etk_Widget *tab_widget);
+void etk_notebook_page_child_set(Etk_Notebook *notebook, int page_num,
Etk_Widget *child);
+
void etk_notebook_current_page_set(Etk_Notebook *notebook, int page_num);
int etk_notebook_current_page_get(Etk_Notebook *notebook);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- etk_tree.c 26 Dec 2005 13:05:37 -0000 1.25
+++ etk_tree.c 26 Dec 2005 13:32:40 -0000 1.26
@@ -85,7 +85,6 @@
static void _etk_tree_grid_scroll_size_get(Etk_Widget *widget, Etk_Size
*scroll_size);
static void _etk_tree_grid_scroll_margins_get(Etk_Widget *widget, Etk_Size
*margins_size);
static void _etk_tree_grid_realize_cb(Etk_Object *object, void *data);
-static void _etk_tree_grid_unrealize_cb(Etk_Object *object, void *data);
static void _etk_tree_constructor(Etk_Tree *tree);
static void _etk_tree_destructor(Etk_Tree *tree);
@@ -1248,7 +1247,6 @@
ETK_WIDGET(grid)->scroll_size_get = _etk_tree_grid_scroll_size_get;
ETK_WIDGET(grid)->scroll_margins_get = _etk_tree_grid_scroll_margins_get;
etk_signal_connect("realize", ETK_OBJECT(grid),
ETK_CALLBACK(_etk_tree_grid_realize_cb), NULL);
- etk_signal_connect("unrealize", ETK_OBJECT(grid),
ETK_CALLBACK(_etk_tree_grid_unrealize_cb), NULL);
}
/* Creates or destroys the rows according to the new height of the tree grid,
and then updates the tree */
@@ -1783,20 +1781,6 @@
_etk_tree_col_realize(tree, i);
}
-/* Called when the tree grid is unrealized */
-static void _etk_tree_grid_unrealize_cb(Etk_Object *object, void *data)
-{
- Etk_Tree *tree;
- Etk_Widget *grid;
-
- if (!(grid = ETK_WIDGET(object)))
- return;
- tree = ETK_TREE_GRID(grid)->tree;
-
- /* TODO */
- printf("Tree Grid unrealized\n");
-}
-
/**************************
* Tree
**************************/
-------------------------------------------------------
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
