Fixes for compilation on OpenVMS platforms

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

diff --git a/setup.h_vms b/setup.h_vms
index 18d982cc5b4e006989101ccbb6ab528d626d78f4..4e227163b43c32140443f3b68e51d183fdd99d2a 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.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 23 October 2009                                                    *
+ * Date : 26 January 2010                                                    *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -340,9 +340,7 @@ typedef pid_t GPid;
 
 #define wxUSE_PROPGRID  1
 
 
 #define wxUSE_PROPGRID  1
 

-#ifndef wxUSE_GRAPHICS_CONTEXT

 #define wxUSE_GRAPHICS_CONTEXT 0
 #define wxUSE_GRAPHICS_CONTEXT 0

-#endif

 
 #define wxUSE_CONTROLS     1
 
 
 #define wxUSE_CONTROLS     1
 


@@ -1302,6 +1300,10 @@ typedef pid_t GPid;
 #define wxHAS_RAW_BITMAP 1
 #endif
 
 #define wxHAS_RAW_BITMAP 1
 #endif
 

+#ifdef VMS_GTK2
+#define GSEAL(x) x
+#endif
+

 #define __VMS_BROKEN_TEMPLATES
 
 #include <stdlib.h>
 #define __VMS_BROKEN_TEMPLATES
 
 #include <stdlib.h>

diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c
index 610772cb0e6de1566b15e8c3d2b4584f844f68f8..625a8446087a376b8c7e71d5a19fedf672eb015d 100644 (file)
--- a/src/gtk/treeentry_gtk.c
+++ b/src/gtk/treeentry_gtk.c
@@ -11,6 +11,7 @@
 #include <types.h>
 typedef pid_t GPid;
 #define G_GNUC_INTERNAL 
 #include <types.h>
 typedef pid_t GPid;
 #define G_GNUC_INTERNAL 

+#define GSEAL(x) x

 #endif
 
 #include "wx/gtk/treeentry_gtk.h"
 #endif
 
 #include "wx/gtk/treeentry_gtk.h"