fixing 'id' objc.h collisions

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

diff --git a/include/wx/mac/carbon/msgdlg.h b/include/wx/mac/carbon/msgdlg.h
index 1fcb44e28dbe0d9b7409bb89d00a4774714e28aa..c74734d9d2910ea57d3ac1056dc6bd06f017cb33 100644 (file)
--- a/include/wx/mac/carbon/msgdlg.h
+++ b/include/wx/mac/carbon/msgdlg.h
@@ -13,18 +13,14 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 #include "wx/dialog.h"
 
 /*
  * Message box dialog
  */
 
 #include "wx/dialog.h"
 
 /*
  * Message box dialog
  */
 

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

 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {


@@ -43,6 +39,7 @@ public:
 
     int ShowModal();
 
 
     int ShowModal();
 

+protected:

     // not supported for message dialog, RR
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
     // not supported for message dialog, RR
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),