|
From: <sl...@us...> - 2003-11-05 19:31:22
|
Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1:/tmp/cvs-serv14366/include
Modified Files:
aedApp.h aedButton.h aedWidget.h
Log Message:
Added tab focus support
Added global buttons for okay and cancel actions
Index: aedApp.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedApp.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aedApp.h 25 Oct 2003 19:23:05 -0000 1.16
--- aedApp.h 5 Nov 2003 19:26:06 -0000 1.17
***************
*** 136,139 ****
--- 136,147 ----
void setFocusWidget(aedWidget *win);
+ /** Handle okay and cancel buttons. */
+ void setOkayButton(aedButton *button) { m_okayButton = button; }
+ void setCancelButton(aedButton *button) { m_cancelButton = button; }
+ aedButton *getOkayButton() { return m_okayButton; }
+ aedButton *getCancelButton() { return m_cancelButton; }
+ void clickOkayButton();
+ void clickCancelButton();
+
/** Enable or disable UTF8 text rendering.
* Rendering UTF8 text is disabled by default. */
***************
*** 152,156 ****
aedWidget *m_Root;
aedWidget *m_FocusWidget;
!
bool m_UTF8;
};
--- 160,166 ----
aedWidget *m_Root;
aedWidget *m_FocusWidget;
! aedButton *m_okayButton;
! aedButton *m_cancelButton;
!
bool m_UTF8;
};
Index: aedButton.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedButton.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aedButton.h 25 Oct 2003 00:06:01 -0000 1.12
--- aedButton.h 5 Nov 2003 19:26:06 -0000 1.13
***************
*** 47,50 ****
--- 47,51 ----
*/
aedButton(aedButtonType type = ROUND);
+ virtual ~aedButton();
virtual void render(void);
virtual int wm_update(Uint32 msdelta);
***************
*** 78,81 ****
--- 79,85 ----
/** Set toggle mode. */
void setToggleMode(bool mode);
+
+ /** Simulate a button down and button up event. */
+ void click();
protected:
Index: aedWidget.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedWidget.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedWidget.h 1 Nov 2003 02:22:31 -0000 1.5
--- aedWidget.h 5 Nov 2003 19:26:06 -0000 1.6
***************
*** 271,275 ****
return m_IsEnabled;
}
!
void update();
--- 271,279 ----
return m_IsEnabled;
}
! bool canFocus() const
! {
! return m_CanFocus && isEnabled();
! }
!
void update();
***************
*** 302,305 ****
--- 306,312 ----
void makeAllDirty(void);
void updateAllChildren(Uint32 msdelta);
+ bool tabFocus();
+ bool tabFocusChildren();
+ void tabFocusParent();
protected:
|