X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..446659cac6be2946cc58ccc574fc8a4d1f7bad5a:/include/wx/univ/dialog.h diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index f3fce059b8..07ac1bbca1 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -1,26 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/univ/dialog.h // Purpose: wxDialog class // Author: Vaclav Slavik // Created: 2001/09/16 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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() { 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 // -------------------------------