X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 855ce352c8..40111edb24 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -20,19 +20,18 @@ #include "wx/containr.h" #include "wx/toplevel.h" +class WXDLLEXPORT wxSizer; +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 -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { @@ -42,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 @@ -56,12 +59,16 @@ public: #if wxUSE_BUTTON // places buttons into a horizontal wxBoxSizer wxSizer *CreateButtonSizer( long flags ); + wxStdDialogButtonSizer *CreateStdDialogButtonSizer( long flags ); #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();