X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94b4dd54994eeae0e625bca08446f7e8d8d917a8..5c3c1372775ad7fd04448fb033ba1224780f6b65:/include/wx/dialog.h?ds=inline diff --git a/include/wx/dialog.h b/include/wx/dialog.h index ef747fe246..4cc11bab8a 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -55,9 +55,9 @@ enum wxDialogLayoutAdaptationMode enum wxDialogModality { - wxDIALOG_MODALITY_NONE = 0, - wxDIALOG_MODALITY_WINDOW_MODAL = 1, - wxDIALOG_MODALITY_APP_MODAL = 2 + wxDIALOG_MODALITY_NONE = 0, + wxDIALOG_MODALITY_WINDOW_MODAL = 1, + wxDIALOG_MODALITY_APP_MODAL = 2 }; extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; @@ -65,12 +65,6 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow { public: - enum - { - // all flags allowed in wxDialogBase::CreateButtonSizer() - ButtonSizerFlags = wxOK|wxCANCEL|wxYES|wxNO|wxHELP|wxNO_DEFAULT - }; - wxDialogBase() { Init(); } virtual ~wxDialogBase() { } @@ -80,7 +74,7 @@ public: virtual bool IsModal() const = 0; // show the dialog frame-modally (needs a parent), using app-modal // dialogs on platforms that don't support it - virtual bool ShowWindowModal () ; + virtual void ShowWindowModal () ; virtual void SendWindowModalDialogEvent ( wxEventType type ); // Modal dialogs have a return code - usually the id of the last @@ -348,8 +342,8 @@ public: wxDialog *GetDialog() const { return wxStaticCast(GetEventObject(), wxDialog); } - - int GetReturnCode() const + + int GetReturnCode() const { return GetDialog()->GetReturnCode(); } virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }