[Libufo-commits] ufo-0.5/include/ufo umodel.hpp,1.2,1.3

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

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

Modified Files:
	umodel.hpp 
Log Message:
Added button model.

Index: umodel.hpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/umodel.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** umodel.hpp	21 Jun 2005 09:26:40 -0000	1.2
--- umodel.hpp	24 Oct 2005 15:57:31 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  class UDocument;
  class UTextLayout;
+ 
  /** @short A widget model represents the application data of a widget
    *  which is painted by UStyle and modified by UWidget.
***************
*** 83,86 ****
--- 84,100 ----
  class UCompoundModel : public UWidgetModel {
  public:
+ 	std::string text;
+ 	UIcon * icon;
+ 	int acceleratorIndex;
+ };
+ 
+ /** @short The button model represents the application data of a generic
+   *  button (including check boxes and radio buttons).
+   * @ingroup internal
+   *
+   * @author Johannes Schmidt
+   */
+ class UButtonModel : public UCompoundModel {
+ public:
  	enum ButtonFeatures {
  		None = 0,
***************
*** 89,96 ****
  		HasMenu = 4
  	};
! 	std::string text;
! 	UIcon * icon;
! 	int acceleratorIndex;
! 	uint32_t buttonFeatures;
  };
  
--- 103,114 ----
  		HasMenu = 4
  	};
! 	enum CheckType {
! 		NotCheckable = 0,
! 		Exclusive,
! 		NonExclusive
! 	};
! 	int buttonFeatures;
! 	int checkType;
! 	UKeyStroke shortcut;
  };
  
***************
*** 101,110 ****
    * @author Johannes Schmidt
    */
! class UMenuItemModel : public UCompoundModel {
  public:
- 	enum CheckType { NotCheckable = 0, Exclusive, NonExclusive };
- 	int checkType;
  	int maxIconWidth;
- 	UKeyStroke shortcut;
  };
  
--- 119,125 ----
    * @author Johannes Schmidt
    */
! class UMenuItemModel : public UButtonModel {
  public:
  	int maxIconWidth;
  };