Enlightenment CVS committal
Author : moom
Project : e17
Module : libs/enhance
Dir : e17/libs/enhance/src/lib
Modified Files:
enhance_widget.c
Log Message:
* Update to recent API changes
===================================================================
RCS file: /cvs/e/e17/libs/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- enhance_widget.c 17 Jan 2007 01:39:59 -0000 1.27
+++ enhance_widget.c 10 Mar 2007 04:04:26 -0000 1.28
@@ -1,5 +1,8 @@
#include "enhance_private.h"
+#define BOX_FILL_POLICY(expand, fill) \
+ (((expand) ? ETK_BOX_EXPAND : ETK_BOX_NONE) | ((fill) ? ETK_BOX_FILL :
ETK_BOX_NONE))
+
static E_Widget *_e_widget_new(Enhance *en, EXML_Node *node, Etk_Widget
*etk_widget, char *id);
static E_Widget *_e_widget_window_handle(Enhance *en, EXML_Node *node);
static E_Widget *_e_widget_dialog_handle(Enhance *en, EXML_Node *node);
@@ -963,22 +966,26 @@
ETK_DIALOG(parent->wid),
ETK_BUTTON(child->wid),
atoi(prop->value),
- expand, fill, padding,
- ETK_FALSE);
+ ETK_BOX_START,
+ BOX_FILL_POLICY(expand, fill),
+ padding);
}
else
{
etk_dialog_pack_widget_in_action_area(
ETK_DIALOG(parent->wid),
child->wid,
- expand, fill, padding, ETK_FALSE);
+ ETK_BOX_START,
+ BOX_FILL_POLICY(expand, fill),
+ padding);
}
}
else
{
etk_dialog_pack_in_main_area(ETK_DIALOG(parent->wid),
child->wid,
- expand, fill, padding,
- ETK_FALSE);
+ ETK_BOX_START,
+ BOX_FILL_POLICY(expand, fill),
+ padding);
}
}
if(!strcmp(parent_class, "GtkFrame"))
@@ -1074,8 +1081,7 @@
if(child->packing)
{
- fill_policy = child->packing->expand ? ETK_BOX_EXPAND :
ETK_BOX_NONE;
- fill_policy |= child->packing->fill ? ETK_BOX_FILL : ETK_BOX_NONE;
+ fill_policy = BOX_FILL_POLICY(child->packing->expand,
child->packing->fill);
padding = child->packing->padding;
if (child->packing->box_group)
box_group = child->packing->box_group;
-------------------------------------------------------------------------
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
