Frames have Ctrl+Q accelerator set automatically, as per the
PocketPC guidelines Documented issues in manual under wxWinCE topic. wxDEFAULT_DIALOG_STYLES rationalised so we can make use of styles such as wxCLOSE_BOX in future (OK button on titlebar) Added Set/GetAffirmativeId and DoOK so that titlebar OK button can be customised git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,13 +26,9 @@ class WXDLLEXPORT wxStdDialogButtonSizer;
|
||||
#define wxDIALOG_NO_PARENT 0x0001 // Don't make owned by apps top window
|
||||
|
||||
#ifdef __WXWINCE__
|
||||
# ifdef __SMARTPHONE__
|
||||
# define wxDEFAULT_DIALOG_STYLE (wxMAXIMIZE | wxCAPTION)
|
||||
# else
|
||||
# define wxDEFAULT_DIALOG_STYLE (0)
|
||||
# endif
|
||||
#else // !__WXWINCE__
|
||||
# define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
|
||||
#define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX)
|
||||
#else
|
||||
#define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
|
||||
#endif
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
|
||||
@@ -45,11 +41,15 @@ public:
|
||||
|
||||
void Init();
|
||||
|
||||
// the modal dialogs have a return code - usually the id of the last
|
||||
// Modal dialogs have a return code - usually the id of the last
|
||||
// pressed button
|
||||
void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
|
||||
int GetReturnCode() const { return m_returnCode; }
|
||||
|
||||
// The identifier for the affirmative button
|
||||
void SetAffirmativeId(int affirmativeId) { m_affirmativeId = affirmativeId; }
|
||||
int GetAffirmativeId() const { return m_affirmativeId; }
|
||||
|
||||
#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
|
||||
// splits text up at newlines and places the
|
||||
// lines into a vertical wxBoxSizer
|
||||
@@ -63,9 +63,12 @@ public:
|
||||
#endif // wxUSE_BUTTON
|
||||
|
||||
protected:
|
||||
// the return code from modal dialog
|
||||
// The return code from modal dialog
|
||||
int m_returnCode;
|
||||
|
||||
// The identifier for the affirmative button (usually wxID_OK)
|
||||
int m_affirmativeId;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxDialogBase)
|
||||
DECLARE_EVENT_TABLE()
|
||||
WX_DECLARE_CONTROL_CONTAINER();
|
||||
|
Reference in New Issue
Block a user