re-fix MinGW DLL compilation

[wxWidgets.git] / include / wx / msgdlg.h

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 2efa9a4527981832def29ad8e402aa7045271b67..3a0174e8fb4e71fca750f78046be8eba90c2915f 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -18,9 +18,9 @@
 
 #include "wx/dialog.h"
 
 
 #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
 {
 public:
     // ctors


@@ -126,7 +126,7 @@ protected:
 #elif defined(__WXGTK20__)
     #include "wx/gtk/msgdlg.h"
 #elif defined(__WXMAC__)
 #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
 #elif defined(__WXPM__)
     #include "wx/os2/msgdlg.h"
 #endif


@@ -135,7 +135,7 @@ protected:
 // wxMessageBox: the simplest way to use wxMessageDialog
 // ----------------------------------------------------------------------------
 
 // 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,
                              const wxString& caption = wxMessageBoxCaptionStr,
                              long style = wxOK | wxCENTRE,
                              wxWindow *parent = NULL,