X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2afb9e169048b77a41c63b4f4eea3b10daee641a..c2193ac9115470a4ecbc6844bbe19734a8c636ad:/include/wx/msgdlg.h diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 6f48c11f2b..3a0174e8fb 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -18,9 +18,9 @@ #include "wx/dialog.h" -WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[]; -class WXDLLEXPORT wxMessageDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxMessageDialogBase : public wxDialog { public: // ctors @@ -111,11 +111,12 @@ protected: #if defined(__WX_COMPILING_MSGDLGG_CPP__) || \ defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \ - defined(__WXCOCOA__) || \ (defined(__WXGTK__) && !defined(__WXGTK20__)) #include "wx/generic/msgdlgg.h" #define wxMessageDialog wxGenericMessageDialog +#elif defined(__WXCOCOA__) + #include "wx/cocoa/msgdlg.h" #elif defined(__WXPALMOS__) #include "wx/palmos/msgdlg.h" #elif defined(__WXMSW__) @@ -125,7 +126,7 @@ protected: #elif defined(__WXGTK20__) #include "wx/gtk/msgdlg.h" #elif defined(__WXMAC__) - #include "wx/mac/msgdlg.h" + #include "wx/osx/msgdlg.h" #elif defined(__WXPM__) #include "wx/os2/msgdlg.h" #endif @@ -134,7 +135,7 @@ protected: // wxMessageBox: the simplest way to use wxMessageDialog // ---------------------------------------------------------------------------- -int WXDLLEXPORT wxMessageBox(const wxString& message, +int WXDLLIMPEXP_CORE wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, long style = wxOK | wxCENTRE, wxWindow *parent = NULL,