[Libufo-commits] ufo-0.5/src/widgets uwidget.cpp,1.48,1.49

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

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

Modified Files:
	uwidget.cpp 
Log Message:
Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about wrong initialization order.

Index: uwidget.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uwidget.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** uwidget.cpp	16 Sep 2005 12:40:08 -0000	1.48
--- uwidget.cpp	30 Sep 2005 12:37:56 -0000	1.49
***************
*** 89,92 ****
--- 89,93 ----
  	, m_isInValidHierarchy(false)
  	, m_hasInvalidLayout(false)
+ 	, m_styleHintsDetached(false)
  	, m_eventState(0xffffffff)//MouseEvents | MouseMotionEvents) // FIXME
  	, m_parent(NULL)
***************
*** 98,102 ****
  	, m_style(NULL)
  	, m_styleHints(NULL)
- 	, m_styleHintsDetached(false)
  	, m_bounds()
  	, m_clipBounds(URectangle::invalid)
--- 99,102 ----
***************
*** 126,129 ****
--- 126,130 ----
  	, m_isInValidHierarchy(false)
  	, m_hasInvalidLayout(false)
+ 	, m_styleHintsDetached(false)
  	, m_eventState(0xffffffff)//MouseEvents | MouseMotionEvents) // FIXME
  	, m_parent(NULL)
***************
*** 135,139 ****
  	, m_style(NULL)
  	, m_styleHints(NULL)
- 	, m_styleHintsDetached(false)
  	, m_bounds()
  	, m_clipBounds(URectangle::invalid)
--- 136,139 ----
***************
*** 1413,1418 ****
  			m_children.insert(m_children.begin() + index, w);
  		}
! 		int min_pos = std::min(index, old_pos);
! 		for (int i = min_pos; i < m_children.size(); ++i) {
  			getWidget(i)->processWidgetEvent(
  				new UWidgetEvent(getWidget(i), UEvent::WidgetZOrderChanged)
--- 1413,1418 ----
  			m_children.insert(m_children.begin() + index, w);
  		}
! 		unsigned int min_pos = std::min(index, old_pos);
! 		for (unsigned int i = min_pos; i < m_children.size(); ++i) {
  			getWidget(i)->processWidgetEvent(
  				new UWidgetEvent(getWidget(i), UEvent::WidgetZOrderChanged)
***************
*** 1782,1786 ****
  
  static std::list<std::pair<UKeyStroke, UWidget*> > ufo_s_shortcuts;
! static int ufo_s_oldIndex = 0;
  static UKeyStroke ufo_s_oldStroke;
  
--- 1782,1786 ----
  
  static std::list<std::pair<UKeyStroke, UWidget*> > ufo_s_shortcuts;
! static unsigned int ufo_s_oldIndex = 0;
  static UKeyStroke ufo_s_oldStroke;