Removed small OGL glitches; added new sample

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

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 724d4c6e9d8c6d1926de5ba08ae2306b4ce79bdd..c9f37780377d4cdd62d5b9c7f17933372c60a1af 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -40,11 +40,11 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-#ifndef __WXMSW__
+#if !defined( __WXMSW__ ) && !defined( __WXMAC__)

 #define wxMessageDialog wxGenericMessageDialog
 
 int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
 #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);
+  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);

 
 #endif
 
 
 #endif