[Wgui-cvs] wgui/includes wg_checkbox.h,1.15,1.16 wg_menu.h,1.35,1.36 wg_message.h,1.31,1.32 wg_messa
Status: Beta
Brought to you by:
greenwire
Menu
▾
▴
[Wgui-cvs] wgui/includes wg_checkbox.h,1.15,1.16 wg_menu.h,1.35,1.36 wg_message.h,1.31,1.32 wg_messagebox.h,1.5,1.6 wg_toolbar.h,1.14,1.15
|
From: Rob W. <gre...@us...> - 2005-01-07 22:08:49
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26926/includes Modified Files: wg_checkbox.h wg_menu.h wg_message.h wg_messagebox.h wg_toolbar.h Log Message: Work on the message box. Changed the single click message types to include the word SINGLE. Index: wg_toolbar.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_toolbar.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wg_toolbar.h 3 Jun 2004 19:10:52 -0000 1.14 --- wg_toolbar.h 7 Jan 2005 22:08:38 -0000 1.15 *************** *** 52,56 **** //! Add a button to the toolbar //! The toolbar will become the button's parent ! //! The toolbar will catch all CTRL_LCLICK messages from the buttons and will post a CTRL_LCLICK message from the toolbar with the iButtonID value as the iNewValue //! \param pButton A pointer to the button to be inserted, inserts a spacer if this is NULL //! \param iButtonID An identifier that the toolbar will return when a button is clicked on, defaults to 0 --- 52,56 ---- //! Add a button to the toolbar //! The toolbar will become the button's parent ! //! The toolbar will catch all CTRL_SINGLELCLICK messages from the buttons and will post a CTRL_SINGLELCLICK message from the toolbar with the iButtonID value as the iNewValue //! \param pButton A pointer to the button to be inserted, inserts a spacer if this is NULL //! \param iButtonID An identifier that the toolbar will return when a button is clicked on, defaults to 0 *************** *** 60,64 **** //! Add a button to the end of toolbar //! The toolbar will become the button's parent ! //! The toolbar will catch all CTRL_LCLICK messages from the buttons and will post a CTRL_LCLICK message from the toolbar with the iButtonID value as the iNewValue //! \param pButton A pointer to the button to be inserted, inserts a spacer if this is NULL //! \param iButtonID An identifier that the toolbar will return when a button is clicked on, defaults to 0 --- 60,64 ---- //! Add a button to the end of toolbar //! The toolbar will become the button's parent ! //! The toolbar will catch all CTRL_SINGLELCLICK messages from the buttons and will post a CTRL_SINGLELCLICK message from the toolbar with the iButtonID value as the iNewValue //! \param pButton A pointer to the button to be inserted, inserts a spacer if this is NULL //! \param iButtonID An identifier that the toolbar will return when a button is clicked on, defaults to 0 *************** *** 93,97 **** // CMessageClient overrides ! //! CToolBars handle CTRL_LCLICK messages //! \param pMessage A pointer to the message virtual bool HandleMessage(CMessage* pMessage); --- 93,97 ---- // CMessageClient overrides ! //! CToolBars handle CTRL_SINGLELCLICK messages //! \param pMessage A pointer to the message virtual bool HandleMessage(CMessage* pMessage); Index: wg_message.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_message.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wg_message.h 27 Dec 2004 04:59:36 -0000 1.31 --- wg_message.h 7 Jan 2005 22:08:38 -0000 1.32 *************** *** 49,52 **** --- 49,70 ---- { UNKNOWN = 0, //!< An unknown message, this is not a valid type + APP_DESTROY_FRAME, //!< CMessage used to delete frame objects, where Source() is the frame that is to be deleted, Destination() should be 0 + APP_EXIT, //!< CMessage used to tell controls or windows that the application is closing + APP_PAINT, //!< CMessage used to tell controls or windows to redraw themselves + CTRL_DOUBLELCLICK, //!< TIntMessage generated when a control is double clicked with the left mouse button + CTRL_DOUBLEMCLICK, //!< TIntMessage generated when a control is double clicked with the middle mouse button + CTRL_DOUBLERCLICK, //!< TIntMessage generated when a control is double clicked with the right mouse button + CTRL_GAININGKEYFOCUS, //!< CMessage used to tell a control that it's getting the keyboard focus + CTRL_GAININGMOUSEFOCUS, //!< CMessage used to tell a control that it's getting the mouse focus + CTRL_LOSINGKEYFOCUS, //!< CMessage used to tell a control that it's losing the keyboard focus + CTRL_LOSINGMOUSEFOCUS, //!< CMessage used to tell a control that it's losing the mouse focus + CTRL_MESSAGEBOXRETURN, //!< CValueMessage sent when a CMessageBox closes + CTRL_RESIZE, //!< TPointMessage used to tell the app that the view has been resized + CTRL_SINGLELCLICK, //!< TIntMessage generated when a control is clicked on with the left mouse button + CTRL_SINGLEMCLICK, //!< TIntMessage generated when a control is clicked on with the middle mouse button + CTRL_SINGLERCLICK, //!< TIntMessage generated when a control is clicked on with the right mouse button + CTRL_TIMER, //!< TIntMessage used to tell when a timer has expired, where Value() is the count of times fired + CTRL_VALUECHANGE, //!< CValueMessage generated when a control's text or value is changed via user input + CTRL_VALUECHANGING, //!< CValueMessage generated when a control's text or value is in the process of changing via user input KEYBOARD_KEYDOWN, //!< CKeyboardMessage generated when a keyboard key is pressed KEYBOARD_KEYUP, //!< CKeyboardMessage generated when a keyboard key is released *************** *** 54,74 **** MOUSE_BUTTONUP, //!< CMouseMessage generated when a mouse button is released MOUSE_MOVE, //!< CMouseMessage generated when a mouse is moved - CTRL_LCLICK, //!< TIntMessage generated when a control is clicked on with the left mouse button - CTRL_RCLICK, //!< TIntMessage generated when a control is clicked on with the right mouse button - CTRL_MCLICK, //!< TIntMessage generated when a control is clicked on with the middle mouse button - CTRL_DOUBLELCLICK, //!< TIntMessage generated when a control is double clicked with the left mouse button - CTRL_DOUBLERCLICK, //!< TIntMessage generated when a control is double clicked with the right mouse button - CTRL_DOUBLEMCLICK, //!< TIntMessage generated when a control is double clicked with the middle mouse button - CTRL_VALUECHANGE, //!< CValueMessage generated when a control's text or value is changed via user input - CTRL_VALUECHANGING, //!< CValueMessage generated when a control's text or value is in the process of changing via user input - CTRL_RESIZE, //!< TPointMessage used to tell the app that the view has been resized - CTRL_TIMER, //!< TIntMessage used to tell when a timer has expired, where Value() is the count of times fired - CTRL_GAININGKEYFOCUS, //!< CMessage used to tell a control that it's getting the keyboard focus - CTRL_LOSINGKEYFOCUS, //!< CMessage used to tell a control that it's losing the keyboard focus - CTRL_GAININGMOUSEFOCUS, //!< CMessage used to tell a control that it's getting the mouse focus - CTRL_LOSINGMOUSEFOCUS, //!< CMessage used to tell a control that it's losing the mouse focus - CTRL_MESSAGEBOXRETURN, //!< CValueMessage sent when a CMessageBox closes - APP_PAINT, //!< CMessage used to tell controls or windows to redraw themselves - APP_EXIT, //!< CMessage used to tell controls or windows that the application is closing SDL, //!< An unhandled SDL event USER //!< Any user defined messages of type CUserMessage --- 72,75 ---- Index: wg_checkbox.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_checkbox.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wg_checkbox.h 3 Jun 2004 19:10:52 -0000 1.15 --- wg_checkbox.h 7 Jan 2005 22:08:38 -0000 1.16 *************** *** 86,90 **** // CMessageClient overrides ! //! CCheckBoxes handle MOUSE_BUTTONDOWN, MOUSE_BUTTONUP, and it's own CTRL_LCLICK messages //! \param pMessage A pointer to the message virtual bool HandleMessage(CMessage* pMessage); --- 86,90 ---- // CMessageClient overrides ! //! CCheckBoxes handle MOUSE_BUTTONDOWN, MOUSE_BUTTONUP, and it's own CTRL_SINGLELCLICK messages //! \param pMessage A pointer to the message virtual bool HandleMessage(CMessage* pMessage); Index: wg_messagebox.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_messagebox.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wg_messagebox.h 27 Dec 2004 22:59:34 -0000 1.5 --- wg_messagebox.h 7 Jan 2005 22:08:38 -0000 1.6 *************** *** 37,41 **** { 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 --- 37,40 ---- Index: wg_menu.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_menu.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wg_menu.h 9 Jul 2004 16:46:40 -0000 1.35 --- wg_menu.h 7 Jan 2005 22:08:38 -0000 1.36 *************** *** 48,52 **** //! Constructs a new Menu Item //! \param sItemText The text to display for the menu item ! //! \param iItemId An identifier for the menu item, which gets returned in the CTRL_LCLICK message //! \param pPopup A pointer to a popup menu, if the menu item is actually a submenu, this should be 0 if the item isn't a submenu (defaults to 0) SMenuItem(std::string sItemText, long int iItemId = 0, CPopupMenu* pPopup = 0) : --- 48,52 ---- //! Constructs a new Menu Item //! \param sItemText The text to display for the menu item ! //! \param iItemId An identifier for the menu item, which gets returned in the CTRL_SINGLELCLICK message //! \param pPopup A pointer to a popup menu, if the menu item is actually a submenu, this should be 0 if the item isn't a submenu (defaults to 0) SMenuItem(std::string sItemText, long int iItemId = 0, CPopupMenu* pPopup = 0) : *************** *** 57,61 **** std::string sItemText; //!< The caption to display for the menu item ! long int iItemId; //!< An identifier for the menu item, which gets returned in the CTRL_LCLICK message CPopupMenu* pPopup; //!< A pointer to a popup menu, if the menu item is actually a submenu bool bSpacer; //!< Indicates if this is a spacer. If true, pPopup, iItemId and sItemText are ignored. --- 57,61 ---- std::string sItemText; //!< The caption to display for the menu item ! long int iItemId; //!< An identifier for the menu item, which gets returned in the CTRL_SINGLELCLICK message CPopupMenu* pPopup; //!< A pointer to a popup menu, if the menu item is actually a submenu bool bSpacer; //!< Indicates if this is a spacer. If true, pPopup, iItemId and sItemText are ignored. *************** *** 66,70 **** //! The CMenuBase is the base class for CMenus and CPopupMenus, and shouldn't be instantiated itself ! //! Menus will generate CTRL_LCLICK messages when a menu item is selected class CMenuBase : public CWindow --- 66,70 ---- //! The CMenuBase is the base class for CMenus and CPopupMenus, and shouldn't be instantiated itself ! //! Menus will generate CTRL_SINGLELCLICK messages when a menu item is selected class CMenuBase : public CWindow |
