X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/univ/dialog.h diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index fe7dfe7003..02efd9193a 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -11,13 +11,9 @@ #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 WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; +class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase @@ -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 // -------------------------------