With wxTE_PROCESS_TAB, tabs are now inserted in the text control

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

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 51f7d0e39d4fec5a2d02c7d4a85d170b7e2387ba..a82784cff62459b51297509b0d5ada4d50780939 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "msgdlg.h"
 #endif
 
 #pragma interface "msgdlg.h"
 #endif
 


@@ -23,7 +23,7 @@
  * Message box dialog
  */
 
  * Message box dialog
  */
 

-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;

 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {


@@ -38,12 +38,10 @@ public:
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal(void);
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal(void);

-};

 
 

+    DECLARE_NO_COPY_CLASS(wxMessageDialog)
+};

 
 

-int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-  long style = wxOK|wxCENTRE,
-  wxWindow *parent = NULL, int x = -1, int y = -1);

 
 #endif
     // _WX_MSGBOXDLG_H_
 
 #endif
     // _WX_MSGBOXDLG_H_