[Libufo-commits] ufo-0.5/src/widgets ucompound.cpp,1.11,1.12 umenuitem.cpp,1.13,1.14

[Johannes S. <sch...@us...>]

Update of /cvsroot/libufo/ufo-0.5/src/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31290/src/widgets

Modified Files:
	ucompound.cpp umenuitem.cpp 
Log Message:
Added button model.

Index: umenuitem.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/umenuitem.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** umenuitem.cpp	30 Sep 2005 12:37:20 -0000	1.13
--- umenuitem.cpp	24 Oct 2005 15:57:31 -0000	1.14
***************
*** 54,58 ****
  	c->text = model->text;
  	c->acceleratorIndex = model->acceleratorIndex;
! 	c->buttonFeatures = model->buttonFeatures;
  	c->checkType = checkType;
  	c->maxIconWidth = maxIconWidth;
--- 54,58 ----
  	c->text = model->text;
  	c->acceleratorIndex = model->acceleratorIndex;
! 	c->buttonFeatures = UMenuItemModel::None;;//model->buttonFeatures;
  	c->checkType = checkType;
  	c->maxIconWidth = maxIconWidth;

Index: ucompound.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ucompound.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ucompound.cpp	2 Sep 2005 13:24:56 -0000	1.11
--- ucompound.cpp	24 Oct 2005 15:57:31 -0000	1.12
***************
*** 43,47 ****
  	c->text = text;
  	c->acceleratorIndex = -1;
! 	c->buttonFeatures = UCompoundModel::None;
  	delete (model);
  	return c;
--- 43,47 ----
  	c->text = text;
  	c->acceleratorIndex = -1;
! 	//c->buttonFeatures = UCompoundModel::None;
  	delete (model);
  	return c;
***************
*** 164,169 ****
  void
  UCompound::processStateChangeEvent(uint32_t state) {
- 	(static_cast<UCompoundModel*>(m_model))->icon = getIcon();
  	UWidget::processStateChangeEvent(state);
  	if (state & WidgetVisible) {
  		updateMnemonic();
--- 164,171 ----
  void
  UCompound::processStateChangeEvent(uint32_t state) {
  	UWidget::processStateChangeEvent(state);
+ 	if (isVisible() || state & WidgetVisible) {
+ 		(static_cast<UCompoundModel*>(m_model))->icon = getIcon();
+ 	}
  	if (state & WidgetVisible) {
  		updateMnemonic();