updates for OpenVMS

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 23d5f3dc727201c06de93884fc0db1671b3ec290..f6aee85817e147e349f9828d8ef8c3322c5ddf32 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -200,7 +200,7 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 

-#if defined( __VMS ) && define( __ia64 )
+#if defined( __VMS ) && defined( __ia64 )

 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf<char>::pos_type);
 #endif
 
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf<char>::pos_type);
 #endif
 

diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index 9648d3fe33350ca9491f35b3b736aaa512916e56..7e8da1aed84bc1e02bc4d2369ca2286acf1efda4 100755 (executable)
--- a/src/xrc/descrip.mms
+++ b/src/xrc/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 29 August 2011                                                      *
+# Date : 30 September 2011                                                   *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -56,7 +56,8 @@ OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
        xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
        xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj,xh_srchctrl.obj,\
        xh_propdlg.obj,xh_comboctrl.obj,xmladv.obj,xh_editlbox.obj,\
        xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
        xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj,xh_srchctrl.obj,\
        xh_propdlg.obj,xh_comboctrl.obj,xmladv.obj,xh_editlbox.obj,\

-       xh_filectrl.obj,xh_cmdlinkbn.obj,xh_toolbk.obj,xh_bannerwindow.obj
+       xh_filectrl.obj,xh_cmdlinkbn.obj,xh_toolbk.obj,xh_bannerwindow.obj,\
+       xh_timectrl.obj

 
 SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\
 
 SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\


@@ -71,7 +72,8 @@ SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
        xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp,xh_srchctrl.cpp,\
        xh_propdlg.cpp,xh_comboctrl.cpp,xmladv.cpp,xh_editlbox.cpp,\
        xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
        xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp,xh_srchctrl.cpp,\
        xh_propdlg.cpp,xh_comboctrl.cpp,xmladv.cpp,xh_editlbox.cpp,\

-       xh_filectrl.cpp,xh_cmdlinkbn.cpp,xh_toolbk.cpp,xh_bannerwindow.cpp
+       xh_filectrl.cpp,xh_cmdlinkbn.cpp,xh_toolbk.cpp,xh_bannerwindow.cpp,\
+       xh_timectrl.cpp

   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -157,3 +159,4 @@ xh_filectrl.obj : xh_filectrl.cpp
 xh_cmdlinkbn.obj : xh_cmdlinkbn.cpp
 xh_toolbk.obj : xh_toolbk.cpp
 xh_bannerwindow.obj : xh_bannerwindow.cpp
 xh_cmdlinkbn.obj : xh_cmdlinkbn.cpp
 xh_toolbk.obj : xh_toolbk.cpp
 xh_bannerwindow.obj : xh_bannerwindow.cpp

+xh_timectrl.obj : xh_timectrl.cpp