Added variant.h/cpp; changed variable names in object.h; added some

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

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index a2029036a5a0d5a516c4e0f09570fc993530368f..84a58194f878a449bb8fee162d51a7d216c5de93 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -40,11 +40,11 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
 #define wxMessageDialog wxGenericMessageDialog
 
 int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  const long style = wxOK|wxCENTRE, wxWindow *parent = NULL, const int x = -1, const int y = -1);
+  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
 
 #endif