X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a562f4fbdee2042c62ecde59a93cde2b88b656f6..6a5c9b3ff71334ed30bd9ae15425a1ca8ae71174:/include/wx/univ/dialog.h diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index 7bf1c6b382..8a00658066 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -5,17 +5,13 @@ // 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; +extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; class WXDLLEXPORT wxWindowDisabler; class WXDLLEXPORT wxEventLoop; @@ -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 // -------------------------------