X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/univ/dialog.h?ds=sidebyside diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index d31707d6e6..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,16 +11,12 @@ #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 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() { Init(); } @@ -49,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 // -------------------------------