X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e64df9bcc331d49d05a6dc7729ee08071e4c6408..aa4d3151d6218dd21cc9cd6e77ddc0181aa3414c:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index e1afd445d9..f9cfb80b71 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -12,7 +12,7 @@ #ifndef _WX_DIALOG_H_BASE_ #define _WX_DIALOG_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialogbase.h" #endif @@ -20,6 +20,8 @@ #include "wx/containr.h" #include "wx/toplevel.h" +WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; + class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { public: @@ -33,11 +35,11 @@ public: void SetReturnCode(int returnCode) { m_returnCode = returnCode; } int GetReturnCode() const { return m_returnCode; } -#if wxUSE_STATTEXT && wxUSE_TEXTCTRL +#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL // splits text up at newlines and places the // lines into a vertical wxBoxSizer wxSizer *CreateTextSizer( const wxString &message ); -#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL +#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL #if wxUSE_BUTTON // places buttons into a horizontal wxBoxSizer @@ -48,6 +50,7 @@ protected: // the return code from modal dialog int m_returnCode; + DECLARE_NO_COPY_CLASS(wxDialogBase) DECLARE_EVENT_TABLE() WX_DECLARE_CONTROL_CONTAINER(); };