wxMotif STL-ification.

[wxWidgets.git] / include / wx / generic / msgdlgg.h

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index fb8aa5cc65c3c40258eb64e5e6a0a303cbf50323..521f5586fa8340c0c6152afdd8159de105ee07d2 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __MSGDLGH_G__
 #define __MSGDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "msgdlgg.h"
 #endif
 
@@ -22,30 +22,29 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 
 class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
-protected:
-    long m_dialogStyle;
+
 public:
-    wxGenericMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
+    wxGenericMessageDialog(wxWindow *parent, const wxString& message,
+        const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+private:
+    long m_dialogStyle;
+
+    DECLARE_EVENT_TABLE()
 };
 
-#ifndef __WINDOWS__
+#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)) || defined(__WXUNIVERSAL__)
 #define wxMessageDialog wxGenericMessageDialog
-
-int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  long style = wxOK|wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1);
-
 #endif
 
 #endif