X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9facc12633398f1f417d048992b3aba3f587cbfd..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/univ/dialog.h diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index c1e08230c2..02efd9193a 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -5,19 +5,15 @@ // Created: 2001/09/16 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_DIALOG_H_ #define _WX_UNIV_DIALOG_H_ -#ifdef __GNUG__ - #pragma interface "univdialog.h" -#endif - -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; -class WXDLLEXPORT wxWindowDisabler; -class WXDLLEXPORT wxEventLoop; +extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; +class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase @@ -25,21 +21,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase public: wxDialog() { Init(); } - // Constructor with a modal flag, but no window id - the old convention - wxDialog(wxWindow *parent, - const wxString& title, bool modal, - int x = -1, int y= -1, int width = 500, int height = 500, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; - Init(); - Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), - style | modalStyle, name); - } - - ~wxDialog(); - // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, @@ -59,19 +40,21 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - void SetModal(bool flag); + virtual ~wxDialog(); + + // is the dialog in modal state right now? virtual bool IsModal() const; - // For now, same as Show(TRUE) but returns return code + // For now, same as Show(true) but returns return code virtual int ShowModal(); // may be called to terminate the dialog with the given return code virtual void EndModal(int retCode); - // returns TRUE if we're in a modal loop + // returns true if we're in a modal loop bool IsModalShowing() const; - bool Show(bool show = TRUE); + virtual bool Show(bool show = true); // implementation only from now on // ------------------------------- @@ -90,8 +73,10 @@ private: // while we are showing a modal dialog we disable the other windows using // this object wxWindowDisabler *m_windowDisabler; + // modal dialog runs its own event loop wxEventLoop *m_eventLoop; + // is modal right now? bool m_isShowingModal;