Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_combo.c ewl_combo.h
Log Message:
- no reason to keep the popbox around in the struct
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_combo.c 4 Dec 2006 22:45:53 -0000 1.39
+++ ewl_combo.c 6 Dec 2006 15:54:24 -0000 1.40
@@ -37,6 +37,7 @@
int
ewl_combo_init(Ewl_Combo *combo)
{
+ Ewl_Widget *o;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("combo", combo, FALSE);
@@ -82,11 +83,10 @@
/*
* setup the popbox
*/
- combo->popbox = ewl_vbox_new();
- ewl_container_child_append(EWL_CONTAINER(combo->popup), combo->popbox);
- ewl_container_redirect_set(EWL_CONTAINER(combo->popup),
- EWL_CONTAINER(combo->popbox));
- ewl_widget_show(combo->popbox);
+ o = ewl_vbox_new();
+ ewl_container_child_append(EWL_CONTAINER(combo->popup), o);
+ ewl_container_redirect_set(EWL_CONTAINER(combo->popup),
EWL_CONTAINER(o));
+ ewl_widget_show(o);
ewl_object_fill_policy_set(EWL_OBJECT(combo),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
@@ -175,7 +175,7 @@
ewl_widget_show(combo->popup);
ewl_window_raise(EWL_WINDOW(combo->popup));
- ewl_widget_focus_send(EWL_WIDGET(combo->popbox));
+ ewl_widget_focus_send(EWL_WIDGET(combo->popup));
if (!ewl_mvc_dirty_get(EWL_MVC(combo)))
DRETURN(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_combo.h 4 Dec 2006 22:45:53 -0000 1.20
+++ ewl_combo.h 6 Dec 2006 15:54:24 -0000 1.21
@@ -43,7 +43,6 @@
Ewl_MVC mvc; /**< Inherit from Ewl_MVC */
Ewl_Widget *popup; /**< Use a popup to display with. */
- Ewl_Widget *popbox; /**< the box for the popup */
Ewl_Widget *button; /**< expand/contract button */
Ewl_Widget *header; /**< The combo header widget */
unsigned char editable:1; /**< Is the combo editable */
-------------------------------------------------------------------------
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
