[Wgui-cvs] wgui/includes wg_messagebox.h,1.4,1.5

[Rob W. <gre...@us...>]

Update of /cvsroot/wgui/wgui/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21641/includes

Modified Files:
	wg_messagebox.h 
Log Message:
Work on the message box.

Index: wg_messagebox.h
===================================================================
RCS file: /cvsroot/wgui/wgui/includes/wg_messagebox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wg_messagebox.h	27 Dec 2004 04:59:36 -0000	1.4
--- wg_messagebox.h	27 Dec 2004 22:59:34 -0000	1.5
***************
*** 32,56 ****
  {
  
!   //! The CMessageBox class is a simple class that brings up a modal dialog box with a message and waits for user input
  
  class CMessageBox : public CFrame
  {
  public:
!   	//! \param WindowRect A CRect that defines the outer limits of the control
  	//! \param pParent A pointer to the parent view
  	//! \param pFontEngine A pointer to the font engine to use when drawing the control
  	//! If this is set to 0 it will use the default font engine specified by the CApplication (which must be set before instantiating this object)
  	//! \param sTitle The window title, which will appear in the title bar of the view
!   //! \param sMessage The message to display in the message box
!   //! \param iButtons A flag field to indicate which buttons to display in the message box
  	CMessageBox(CView* pParent, CFontEngine* pFontEngine, const std::string& sTitle, const std::string& sMessage, int iButtons);
  
! 	//! The 
  	enum EButton {
! 	  BUTTON_INVALID = 0,
! 	  BUTTON_CANCEL = 1,
! 	  BUTTON_OK = 2,
! 	  BUTTON_NO = 4,
! 	  BUTTON_YES = 8
  	};
  
--- 32,56 ----
  {
  
! //! The CMessageBox class is a simple class that brings up a modal dialog box with a message and waits for user input
  
  class CMessageBox : public CFrame
  {
  public:
! 	//! \param WindowRect A CRect that defines the outer limits of the control
  	//! \param pParent A pointer to the parent view
  	//! \param pFontEngine A pointer to the font engine to use when drawing the control
  	//! If this is set to 0 it will use the default font engine specified by the CApplication (which must be set before instantiating this object)
  	//! \param sTitle The window title, which will appear in the title bar of the view
! 	//! \param sMessage The message to display in the message box
! 	//! \param iButtons A flag field to indicate which buttons to display in the message box
  	CMessageBox(CView* pParent, CFontEngine* pFontEngine, const std::string& sTitle, const std::string& sMessage, int iButtons);
  
! 	//! The
  	enum EButton {
! 		BUTTON_INVALID = 0,
! 		BUTTON_CANCEL = 1,
! 		BUTTON_OK = 2,
! 		BUTTON_NO = 4,
! 		BUTTON_YES = 8
  	};
  
***************
*** 68,74 ****
  protected:
  	CLabel* m_pMessageLabel;  //!< The label that is used for the message
! 	std::map<EButton, CButton*> m_ButtonMap;  //!< A map for the buttons 
  	int m_iButtons;  //!< The ORed value of the buttons to display in the message box
- 	EButton m_ReturnValue;
  
  
--- 68,73 ----
  protected:
  	CLabel* m_pMessageLabel;  //!< The label that is used for the message
! 	std::map<EButton, CButton*> m_ButtonMap;  //!< A map for the buttons
  	int m_iButtons;  //!< The ORed value of the buttons to display in the message box