Committing in .

 setup.h_vms : updated VMS configuration
 msgdlg.cpp : corrected include file path

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/src/motif/msgdlg.cpp
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/setup.h_vms b/setup.h_vms
index 7ae15526b81542897a819550c5f544b924669d81..9bd4be7c8fb7270fa23d4e239eaf50a2f0808162 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                             *
- * Date : 9 November 1999                                                    *
+ * Date : 15 March 2005                                                      *
  *                                                                           *
  *****************************************************************************/
 
@@ -122,6 +122,9 @@
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+#undef __Point__
+
 /* MS-DOS with DJGPP */
 #undef __DOS__
 

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 6875dfaaac0297035417df22fedddc90f8d558a2..4d08240bc24dd1b0863cdcc1397e84e10a3a8a79 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -41,7 +41,7 @@
 
 #include "wx/app.h"
 #include "wx/intl.h"
-#include "wx/motif/msgdlg.h"
+#include "wx/msgdlg.h"
 #include "wx/motif/private.h"
 
 // ----------------------------------------------------------------------------