fixing 10.5 only compiles

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 6f48c11f2be059cf417dd6d1bd992ffb40f2c50b..60493ecb7ca003a91f51f75d8694306cb701a206 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -18,7 +18,7 @@
 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 

-WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
+WXDLLEXPORT_DATA(extern const char) wxMessageBoxCaptionStr[];

 
 class WXDLLEXPORT wxMessageDialogBase : public wxDialog
 {
 
 class WXDLLEXPORT wxMessageDialogBase : public wxDialog
 {


@@ -111,11 +111,12 @@ protected:
 
 #if defined(__WX_COMPILING_MSGDLGG_CPP__) || \
     defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \
 
 #if defined(__WX_COMPILING_MSGDLGG_CPP__) || \
     defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \

-    defined(__WXCOCOA__) || \

     (defined(__WXGTK__) && !defined(__WXGTK20__))
     #include "wx/generic/msgdlgg.h"
 
     #define wxMessageDialog wxGenericMessageDialog
     (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__)
 #elif defined(__WXPALMOS__)
     #include "wx/palmos/msgdlg.h"
 #elif defined(__WXMSW__)