X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/univ/dialog.h?ds=sidebyside diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index 7bf987c18e..07ac1bbca1 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/univ/dialog.h // Purpose: wxDialog class // Author: Vaclav Slavik // Created: 2001/09/16 @@ -11,19 +11,15 @@ #ifndef _WX_UNIV_DIALOG_H_ #define _WX_UNIV_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univdialog.h" -#endif - -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; -class WXDLLEXPORT wxWindowDisabler; -class WXDLLEXPORT wxEventLoop; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; +class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: - wxDialog(); + wxDialog() { Init(); } // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, @@ -31,7 +27,11 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); + const wxString& name = wxDialogNameStr) + { + Init(); + Create(parent, id, title, pos, size, style, name); + } bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -45,16 +45,16 @@ public: // 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 // -------------------------------