From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Wed, 15 Dec 2010 09:51:48 +0000 (+0000)
Subject: Include compilation of tests for OpenVMS (part1)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/38e5440573cfc2501af256839cfaa17c26ded7ed?hp=377c1ba43887a1b89d3feecaeb0d51d97030417f

Include compilation of tests for OpenVMS (part1)

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

diff --git a/descrip.mms b/descrip.mms
index 9c2d5177bd..7eeb5358fa 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 2 November 2010                                                     *
+# Date : 15 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -144,7 +144,9 @@ gtk : [.include.wx]setup.h
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.xrc]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-	set default [--]
+	set default [--.tests]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)/ignore=warning
+	set default [-]
 
 gtk2 : [.include.wx]setup.h
 	@gnome$root:[000000]glib2
diff --git a/setup.h_vms b/setup.h_vms
index 53dc6c89a8..a1f602d290 100644
--- 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)                            *
- * Date : 19 August 2010                                                     *
+ * Date : 14 December 2010                                                   *
  *                                                                           *
  *****************************************************************************/
 
@@ -23,6 +23,11 @@
 /* Define as __inline if that's what the C compiler calls it.  */
 #undef inline
 
+#else
+
+#define __USE_STD_IOSTREAM 1
+#define _USE_STD_STAT 1
+
 #endif /* __cplusplus */
 
 /* fill in with the string wxGetOsDescription() will return */
@@ -231,7 +236,7 @@ typedef pid_t GPid;
         || (defined(_MSC_VER) && _MSC_VER < 1200)
     #define wxUSE_STD_DEFAULT  0
 #else
-    #define wxUSE_STD_DEFAULT  0
+    #define wxUSE_STD_DEFAULT  1
 #endif
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
diff --git a/src/aui/descrip.mms b/src/aui/descrip.mms
index c586a7e47d..d2b4d86895 100755
--- a/src/aui/descrip.mms
+++ b/src/aui/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 9 September 2008                                                    *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -67,6 +67,8 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 dockart.obj : dockart.cpp
 floatpane.obj : floatpane.cpp
 framemanager.obj : framemanager.cpp
diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 42ac3149c5..5b6fc3241f 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 10 May 2010                                                         *
+# Date : 15 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -217,7 +217,8 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
 		rearrangectrl.obj,spinctrlcmn.obj,datetimefmt.obj,xlocale.obj,\
 		regex.obj,any.obj,archive.obj,fs_arc.obj,arcall.obj,\
 		arcfind.obj,tarstrm.obj,datavcmn.obj,debugrpt.obj,\
-		translation.obj,languageinfo.obj,filehistorycmn.obj
+		translation.obj,languageinfo.obj,filehistorycmn.obj,\
+		stdstream.obj,uiactioncmn.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -416,7 +417,7 @@ SOURCES = \
 		xtistrm.cpp,\
 		xtixml.cpp,\
 		wrapsizer.cpp,archive.cpp,fs_arc.cpp,arcall.cpp,arcfind.cpp,\
-		tarstrm.cpp,datavcmn.cpp,debugrpt.cpp
+		tarstrm.cpp,datavcmn.cpp,debugrpt.cpp,uiactioncmn.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -669,3 +670,5 @@ debugrpt.obj : debugrpt.cpp
 translation.obj : translation.cpp
 languageinfo.obj : languageinfo.cpp
 filehistorycmn.obj : filehistorycmn.cpp
+stdstream.obj : stdstream.cpp
+uiactioncmn.obj : uiactioncmn.cpp
diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index c88f2323e2..0dfdda9a51 100644
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 4 November 2010                                                     *
+# Date : 15 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -94,7 +94,7 @@ OBJECTS = \
 		filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\
 		grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
 		editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
-		richmsgdlgg.obj,commandlinkbuttong.obj
+		richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj
 
 SOURCES = \
 		aboutdlgg.cpp,\
@@ -166,7 +166,7 @@ SOURCES = \
 		icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\
 		,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
 		datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
-		commandlinkbuttong.cpp
+		commandlinkbuttong.cpp,spinctlg.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
@@ -301,3 +301,4 @@ dbgrptg.obj : dbgrptg.cpp
 dragimgg.obj : dragimgg.cpp
 richmsgdlgg.obj : richmsgdlgg.cpp
 commandlinkbuttong.obj : commandlinkbuttong.cpp
+spinctlg.obj : spinctlg.cpp
diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index b775626f19..dd354525dc 100644
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -2,21 +2,38 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 29 Novemer 2010                                                     *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
 	define wx [--.include.wx]
 
-.ifdef __WXUNIVERSAL__
-CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm
+.ifdef __WXMOTIF__
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
+.else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
 .else
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm\
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm
+.else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)
+.else
+CXX_DEFINE =
+CC_DEFINE =
+.endif
+.endif
+.endif
 .endif
 
 .suffixes : .cpp
@@ -27,207 +44,60 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-	app.obj,\
-	bitmap.obj,\
-	brush.obj,\
-	clipbrd.obj,\
-	colour.obj,\
-	cursor.obj,\
-	data.obj,\
-	dataobj.obj,\
-	dc.obj,\
-	dcclient.obj,\
-	dcmemory.obj,\
-	dcscreen.obj,\
-        dnd.obj,\
-        evtloop.obj,\
-	filedlg.obj,\
-	font.obj,\
-        glcanvas.obj,\
-	sockgtk.obj,\
-	main.obj,\
-	minifram.obj,\
-	pen.obj,\
-	popupwin.obj,\
-	renderer.obj,\
-	region.obj,\
-	settings.obj,\
-	timer.obj,\
-	tooltip.obj,\
-	toplevel.obj,\
-	utilsgtk.obj,\
-	utilsres.obj,\
-        win_gtk.obj,\
-	window.obj
+	helpctrl.obj,helpdata.obj,helpfrm.obj,htmlcell.obj,htmlfilt.obj,\
+	htmlpars.obj,htmltag.obj,htmlwin.obj,htmprint.obj,m_dflist.obj,\
+	m_fonts.obj,m_hline.obj,m_image.obj,m_layout.obj,m_links.obj,\
+	m_list.obj,m_pre.obj,m_tables.obj,winpars.obj,chm.obj,m_style.obj,\
+	styleparams.obj,m_span.obj
 
-OBJECTS0= \
-        bmpbuttn.obj,\
-	button.obj,\
-	checkbox.obj,\
-	checklst.obj,\
-	choice.obj,\
-        combobox.obj,\
-	control.obj,\
-	dialog.obj,\
-	fontdlg.obj,\
-	frame.obj,\
-	gauge.obj,\
-	listbox.obj,\
-	mdi.obj,\
-	menu.obj,\
-	notebook.obj,\
-	radiobox.obj,\
-	radiobut.obj,\
-	scrolbar.obj,\
-	scrolwin.obj,\
-	slider.obj,\
-        spinbutt.obj,\
-	spinctrl.obj,\
-	statbmp.obj,\
-	statbox.obj,\
-	statline.obj,\
-	stattext.obj,\
-	toolbar.obj,\
-	textctrl.obj,\
-	tglbtn.obj,\
-	msgdlg.obj,mnemonics.obj
-
-SOURCES =\
-	app.cpp,\
-	bitmap.cpp,\
-        bmpbuttn.cpp,\
-	brush.cpp,\
-	button.cpp,\
-	checkbox.cpp,\
-	checklst.cpp,\
-	choice.cpp,\
-	clipbrd.cpp,\
-	colour.cpp,\
-        combobox.cpp,\
-	control.cpp,\
-	cursor.cpp,\
-	data.cpp,\
-	dataobj.cpp,\
-	dc.cpp,\
-	dcclient.cpp,\
-	dcmemory.cpp,\
-	dcscreen.cpp,\
-	dialog.cpp,\
-        dnd.cpp,\
-        evtloop.cpp,\
-	filedlg.cpp,\
-	font.cpp,\
-	fontdlg.cpp,\
-	frame.cpp,\
-	gauge.cpp,\
-        glcanvas.cpp,\
-	sockgtk.cpp,\
-	listbox.cpp,\
-	main.cpp,\
-	mdi.cpp,\
-	menu.cpp,\
-	minifram.cpp,\
-	msgdlg.cpp,\
-	notebook.cpp,\
-	pen.cpp,\
-	popupwin.cpp,\
-	radiobox.cpp,\
-	radiobut.cpp,\
-	renderer.cpp,\
-	region.cpp,\
-	scrolbar.cpp,\
-	scrolwin.cpp,\
-	settings.cpp,\
-	slider.cpp,\
-        spinbutt.cpp,\
-	spinctrl.cpp,\
-	statbmp.cpp,\
-	statbox.cpp,\
-	statline.cpp,\
-	stattext.cpp,\
-	toolbar.cpp,\
-	textctrl.cpp,\
-	tglbtn.cpp,\
-	timer.cpp,\
-	tooltip.cpp,\
-	toplevel.cpp,\
-	utilsgtk.cpp,\
-	utilsres.cpp,\
-        win_gtk.c,\
-	window.cpp,mnemonics.cpp
-   
+SOURCES = \
+	helpctrl.cpp,helpdata.cpp,helpfrm.cpp,htmlcell.cpp,htmlfilt.cpp,\
+	htmlpars.cpp,htmltag.cpp,htmlwin.cpp,htmprint.cpp,m_dflist.cpp,\
+	m_fonts.cpp,m_hline.cpp,m_image.cpp,m_layout.cpp,m_links.cpp,\
+	m_list.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp,chm.cpp,m_style.cpp,\
+	styleparams.cpp,m_span.cpp
+  
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXUNIVERSAL__
-	library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-	library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
+.ifdef __WXMOTIF__
+	library [--.lib]libwx_motif.olb $(OBJECTS)
 .else
+.ifdef __WXGTK__
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
-	library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
-	library [--.lib]libwx_gtk.olb $(OBJECTS0)
+.else
+.ifdef __WXGTK2__
+	library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
+.ifdef __WXX11__
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
+.endif
 .endif
+.endif
+.endif
+
+$(OBJECTS) : [--.include.wx]setup.h
 
-app.obj : app.cpp
-bitmap.obj : bitmap.cpp
-bmpbuttn.obj : bmpbuttn.cpp
-brush.obj : brush.cpp
-button.obj : button.cpp
-checkbox.obj : checkbox.cpp
-checklst.obj : checklst.cpp
-choice.obj : choice.cpp
-clipbrd.obj :clipbrd.cpp
-colour.obj : colour.cpp
-combobox.obj : combobox.cpp
-control.obj : control.cpp
-cursor.obj : cursor.cpp
-data.obj : data.cpp
-dataobj.obj : dataobj.cpp
-dc.obj : dc.cpp
-dcclient.obj : dcclient.cpp
-dcmemory.obj : dcmemory.cpp
-dcscreen.obj : dcscreen.cpp
-dialog.obj : dialog.cpp
-dnd.obj : dnd.cpp
-evtloop.obj : evtloop.cpp
-filedlg.obj : filedlg.cpp
-font.obj : font.cpp
-fontdlg.obj : fontdlg.cpp
-frame.obj : frame.cpp
-gauge.obj : gauge.cpp
-glcanvas.obj : glcanvas.cpp
-sockgtk.obj : sockgtk.cpp
-listbox.obj : listbox.cpp
-main.obj : main.cpp
-msgdlg.obj : msgdlg.cpp
-mdi.obj : mdi.cpp
-menu.obj : menu.cpp
-minifram.obj : minifram.cpp
-notebook.obj : notebook.cpp
-pen.obj : pen.cpp
-popupwin.obj : popupwin.cpp
-radiobox.obj : radiobox.cpp
-radiobut.obj : radiobut.cpp
-renderer.obj : renderer.cpp
-region.obj : region.cpp
-scrolbar.obj : scrolbar.cpp
-scrolwin.obj : scrolwin.cpp
-settings.obj : settings.cpp
-slider.obj : slider.cpp
-spinbutt.obj : spinbutt.cpp
-spinctrl.obj : spinctrl.cpp
-statbmp.obj : statbmp.cpp
-statbox.obj : statbox.cpp
-statline.obj : statline.cpp
-stattext.obj : stattext.cpp
-toolbar.obj : toolbar.cpp
-textctrl.obj : textctrl.cpp
-tglbtn.obj : tglbtn.cpp
-timer.obj : timer.cpp
-tooltip.obj : tooltip.cpp
-toplevel.obj : toplevel.cpp
-utilsgtk.obj : utilsgtk.cpp
-utilsres.obj : utilsres.cpp
-win_gtk.obj : win_gtk.c
-window.obj : window.cpp
-mnemonics.obj : mnemonics.cpp
+helpctrl.obj : helpctrl.cpp
+helpdata.obj : helpdata.cpp
+helpfrm.obj : helpfrm.cpp
+htmlcell.obj : htmlcell.cpp
+htmlfilt.obj : htmlfilt.cpp
+htmlpars.obj : htmlpars.cpp
+htmltag.obj : htmltag.cpp
+htmlwin.obj : htmlwin.cpp
+htmprint.obj : htmprint.cpp
+m_dflist.obj : m_dflist.cpp
+m_fonts.obj : m_fonts.cpp
+m_hline.obj : m_hline.cpp
+m_image.obj : m_image.cpp
+m_layout.obj : m_layout.cpp
+m_links.obj : m_links.cpp
+m_list.obj : m_list.cpp
+m_pre.obj : m_pre.cpp
+m_tables.obj : m_tables.cpp
+winpars.obj : winpars.cpp
+	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn winpars.cpp
+chm.obj : chm.cpp
+m_style.obj : m_style.cpp
+styleparams.obj : styleparams.cpp
+m_span.obj : m_span.cpp
diff --git a/src/propgrid/descrip.mms b/src/propgrid/descrip.mms
index 331fa37daa..2a7a087212 100644
--- a/src/propgrid/descrip.mms
+++ b/src/propgrid/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 22 September 2009                                                   *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -67,6 +67,8 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 advprops.obj : advprops.cpp
 editors.obj : editors.cpp
 manager.obj : manager.cpp
diff --git a/src/regex/descrip.mms b/src/regex/descrip.mms
index f150ace9a1..ac5f03c4d3 100644
--- a/src/regex/descrip.mms
+++ b/src/regex/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 5 October 2009                                                      *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -70,6 +70,8 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 regcomp.obj : regcomp.c
 regerror.obj : regerror.c
 regexec.obj : regexec.c
diff --git a/src/ribbon/descrip.mms b/src/ribbon/descrip.mms
index 1b67b4c6a4..6c9e9faf92 100644
--- a/src/ribbon/descrip.mms
+++ b/src/ribbon/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 22 September 2009                                                   *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -68,6 +68,8 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 art_aui.obj : art_aui.cpp
 art_internal.obj : art_internal.cpp
 art_msw.obj : art_msw.cpp
diff --git a/src/richtext/descrip.mms b/src/richtext/descrip.mms
index a50ed4de30..2be8e40b7d 100644
--- a/src/richtext/descrip.mms
+++ b/src/richtext/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 4 October 2010                                                      *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -75,6 +75,8 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 richtextbuffer.obj : richtextbuffer.cpp
 	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn richtextbuffer.cpp
 richtextctrl.obj : richtextctrl.cpp
diff --git a/src/stc/descrip.mms b/src/stc/descrip.mms
index 84af42b3bc..019e7a1d57 100644
--- a/src/stc/descrip.mms
+++ b/src/stc/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 1 April 2010                                                        *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -82,6 +82,8 @@ all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS)
 	set def [--]
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 PlatWX.obj : PlatWX.cpp
 ScintillaWX.obj : ScintillaWX.cpp
 stc.obj : stc.cpp
diff --git a/src/stc/scintilla/src/descrip.mms b/src/stc/scintilla/src/descrip.mms
index 2b507d8d14..e24bea856f 100644
--- a/src/stc/scintilla/src/descrip.mms
+++ b/src/stc/scintilla/src/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 20 April 2010                                                       *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 
@@ -18,7 +18,7 @@ CC_DEFINE = /define=(__WX__=1,__WXMOTIF__=1)/name=(as_is,short)\
 	/include=([],[-.src],[-.include])
 .else
 .ifdef __WXGTK__
-CXX_DEFINE = /define=(__WX__=1,__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+CXX_DEFINE = /define=(__WX__=1,__WXGTK__=1,__USE_STD_IOSTREAM=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 	   /assume=(nostdnew,noglobal_array_new)/include=([],[-.src],[-.include])
 CC_DEFINE = /define=(__WX__=1,__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 	/include=([],[-.src],[-.include])
@@ -124,6 +124,9 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [----.include.wx]setup.h
+$(OBJECTS1) : [----.include.wx]setup.h
+
 AutoComplete.obj : AutoComplete.cxx
 CallTip.obj : CallTip.cxx
 CellBuffer.obj : CellBuffer.cxx
diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index bdb995acfc..a133f036e5 100755
--- 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)                             *
-# Date : 2 November 2010                                                        *
+# Date : 14 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -91,6 +91,8 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 xh_bmp.obj : xh_bmp.cpp
 xh_bmpbt.obj : xh_bmpbt.cpp
 xh_bttn.obj : xh_bttn.cpp
diff --git a/tests/archive/archivetest.h b/tests/archive/archivetest.h
index 0d24a105f6..ea81436eac 100644
--- a/tests/archive/archivetest.h
+++ b/tests/archive/archivetest.h
@@ -7,6 +7,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef WX_ARCHIVETEST_INCLUDED
+#define WX_ARCHIVETEST_INCLUDED 1
+
 #define WX_TEST_ARCHIVE_ITERATOR
 
 #include "wx/archive.h"
@@ -271,3 +274,5 @@ private:
 
     void AddCmd(wxArrayString& cmdlist, const wxString& cmd);
 };
+
+#endif
diff --git a/tests/descrip.mms b/tests/descrip.mms
new file mode 100644
index 0000000000..566535e856
--- /dev/null
+++ b/tests/descrip.mms
@@ -0,0 +1,684 @@
+#*****************************************************************************
+#                                                                            *
+# Make file for VMS                                                          *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 15 December 2010                                                    *
+#                                                                            *
+#*****************************************************************************
+.first
+	define wx [-.include.wx]
+
+.ifdef __WXMOTIF__
+TEST_CXXFLAGS = /define=(__WXMOTIF__=1,"wxUSE_GUI=0")/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)
+TEST_GUI_CXXFLAGS = /define=(__WXMOTIF__=1,"wxUSE_GUI=1")/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)
+.else
+.ifdef __WXGTK__
+TEST_CXXFLAGS = /define=(__WXGTK__=1,"wxUSE_GUI=0","__USE_STD_IOSTREAM=1",\
+	"_USE_STD_STAT=1")/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/include=[]
+TEST_GUI_CXXFLAGS = /define=(__WXGTK__=1,"wxUSE_GUI=1","__USE_STD_IOSTREAM=1")\
+	/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/include=[]
+.else
+.ifdef __WXX11__
+TEST_CXXFLAGS = /define=(__WXX11__=1,__WXUNIVERSAL__==1,"wxUSE_GUI=0")/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+TEST_GUI_CXXFLAGS = /define=(__WXGTK__=1,"wxUSE_GUI=1")/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)
+.else
+.ifdef __WXGTK2__
+TEST_CXXFLAGS = /define=(__WXGTK__=1,VMS_GTK2==1,"wxUSE_GUI=0")/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+TEST_GUI_CXXFLAGS = /define=(__WXGTK__=1,"wxUSE_GUI=1")/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)
+.else
+CXX_DEFINE =
+CC_DEFINE =
+.endif
+.endif
+.endif
+.endif
+
+.suffixes : .cpp
+
+.cpp.obj :
+	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+
+CXXC=cxx
+
+TEST_OBJECTS =  \
+	test_test.obj,\
+	test_anytest.obj,\
+	test_archivetest.obj,\
+	test_ziptest.obj,\
+	test_tartest.obj,\
+	test_arrays.obj,\
+	test_base64.obj,\
+	test_cmdlinetest.obj,\
+	test_fileconf.obj,\
+	test_regconf.obj,\
+	test_datetimetest.obj,\
+	test_evthandler.obj,\
+	test_evtsource.obj,\
+	test_stopwatch.obj,\
+	test_timertest.obj,\
+	test_exec.obj,\
+	test_dir.obj,\
+	test_filefn.obj,\
+	test_filetest.obj,\
+	test_filekind.obj,\
+	test_filenametest.obj,\
+	test_filesystest.obj,\
+	test_fontmaptest.obj,\
+	test_formatconvertertest.obj,\
+	test_hashes.obj,\
+	test_output.obj,\
+	test_input.obj,\
+	test_intltest.obj,\
+	test_lists.obj,\
+	test_logtest.obj,\
+	test_longlongtest.obj,\
+	test_convautotest.obj,\
+	test_mbconvtest.obj,\
+	test_dynamiclib.obj,\
+	test_environ.obj,\
+	test_metatest.obj,\
+	test_misctests.obj,\
+	test_module.obj,\
+	test_pathlist.obj,\
+	test_typeinfotest.obj,\
+	test_ipc.obj,\
+	test_socket.obj,\
+	test_regextest.obj,\
+	test_wxregextest.obj,\
+	test_scopeguardtest.obj,\
+	test_iostream.obj,\
+	test_strings.obj,\
+	test_stdstrings.obj,\
+	test_tokenizer.obj,\
+	test_unichar.obj,\
+	test_unicode.obj,\
+	test_crt.obj,\
+	test_vsnprintf.obj,\
+	test_bstream.obj,\
+	test_datastreamtest.obj,\
+	test_ffilestream.obj,\
+	test_fileback.obj,\
+	test_filestream.obj,\
+	test_iostreams.obj,\
+	test_largefile.obj,\
+	test_memstream.obj,\
+	test_socketstream.obj,\
+	test_sstream.obj,\
+	test_stdstream.obj,\
+	test_tempfile.obj,\
+	test_textstreamtest.obj,\
+	test_zlibstream.obj,\
+	test_textfiletest.obj,\
+	test_atomic.obj,\
+	test_misc.obj,\
+	test_queue.obj,\
+	test_tls.obj,\
+	test_ftp.obj,\
+	test_uris.obj,\
+	test_url.obj,\
+	test_vectors.obj,\
+	test_evtconnection.obj,\
+	test_weakref.obj,\
+	test_xlocale.obj,\
+	test_xmltest.obj
+
+TEST_GUI_OBJECTS =  \
+	test_gui_asserthelper.obj,\
+	test_gui_test.obj,\
+	test_gui_testableframe.obj,\
+	test_gui_rect.obj,\
+	test_gui_size.obj,\
+	test_gui_point.obj,\
+	test_gui_bitmap.obj,\
+	test_gui_colour.obj,\
+	test_gui_ellipsization.obj,\
+	test_gui_measuring.obj,\
+	test_gui_config.obj,\
+	test_gui_bitmapcomboboxtest.obj,\
+	test_gui_bitmaptogglebuttontest.obj,\
+	test_gui_bookctrlbasetest.obj,\
+	test_gui_buttontest.obj,\
+	test_gui_checkboxtest.obj,\
+	test_gui_checklistboxtest.obj,\
+	test_gui_choicebooktest.obj,\
+	test_gui_choicetest.obj,\
+	test_gui_comboboxtest.obj,\
+	test_gui_frametest.obj,\
+	test_gui_gaugetest.obj,\
+	test_gui_gridtest.obj,\
+	test_gui_headerctrltest.obj,\
+	test_gui_htmllboxtest.obj,\
+	test_gui_hyperlinkctrltest.obj,\
+	test_gui_itemcontainertest.obj,\
+	test_gui_label.obj,\
+	test_gui_listbasetest.obj,\
+	test_gui_listbooktest.obj,\
+	test_gui_listboxtest.obj,\
+	test_gui_listctrltest.obj,\
+	test_gui_listviewtest.obj,\
+	test_gui_notebooktest.obj,\
+	test_gui_pickerbasetest.obj,\
+	test_gui_pickertest.obj,\
+	test_gui_radioboxtest.obj,\
+	test_gui_radiobuttontest.obj,\
+	test_gui_rearrangelisttest.obj,\
+	test_gui_richtextctrltest.obj,\
+	test_gui_slidertest.obj,\
+	test_gui_spinctrldbltest.obj,\
+	test_gui_spinctrltest.obj,\
+	test_gui_textctrltest.obj,\
+	test_gui_textentrytest.obj,\
+	test_gui_togglebuttontest.obj,\
+	test_gui_toolbooktest.obj,\
+	test_gui_treebooktest.obj,\
+	test_gui_treectrltest.obj,\
+	test_gui_virtlistctrltest.obj,\
+	test_gui_windowtest.obj,\
+	test_gui_clone.obj,\
+	test_gui_propagation.obj,\
+	test_gui_keyboard.obj,\
+	test_gui_fonttest.obj,\
+	test_gui_image.obj,\
+	test_gui_rawbmp.obj,\
+	test_gui_htmlwindow.obj,\
+	test_gui_accelentry.obj,\
+	test_gui_menu.obj,\
+	test_gui_guifuncs.obj,\
+	test_gui_selstoretest.obj,\
+	test_gui_garbage.obj,\
+	test_gui_settings.obj,\
+	test_gui_socket.obj,\
+	test_gui_boxsizer.obj,\
+	test_gui_clientsize.obj,\
+	test_gui_setsize.obj,\
+	test_gui_xrctest.obj
+
+.ifdef __WXMOTIF__
+.else
+.ifdef __WXGTK__
+all : test_gtk.exe test_gui_gtk.exe
+	write sys$output "tests created"
+
+test_gtk.exe : $(TEST_OBJECTS)
+	cxxlink/exec=test_gtk.exe $(TEST_OBJECTS),\
+	sys$library:libcppunit.olb/lib,[-.lib]vms_gtk/opt
+
+test_gui_gtk.exe : $(TEST_GUI_OBJECTS)
+	cxxlink/exec=test_gui_gtk.exe $(TEST_GUI_OBJECTS),\
+	sys$library:libcppunit.olb/lib,[-.lib]vms_gtk/opt
+.else
+.ifdef __WXX11__
+.else
+.ifdef __WXGTK2__
+.else
+.endif
+.endif
+.endif
+.endif
+
+$(TEST_OBJECTS) : [-.include.wx]setup.h
+$(TEST_GUI_OBJECTS) : [-.include.wx]setup.h
+
+test_test.obj : test.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) test.cpp
+
+test_anytest.obj : [.any]anytest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.any]anytest.cpp
+
+test_archivetest.obj : [.archive]archivetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.archive]archivetest.cpp
+
+test_ziptest.obj : [.archive]ziptest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.archive]ziptest.cpp
+
+test_tartest.obj : [.archive]tartest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.archive]tartest.cpp
+
+test_arrays.obj : [.arrays]arrays.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.arrays]arrays.cpp
+
+test_base64.obj : [.base64]base64.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.base64]base64.cpp
+
+test_cmdlinetest.obj : [.cmdline]cmdlinetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.cmdline]cmdlinetest.cpp
+
+test_fileconf.obj : [.config]fileconf.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.config]fileconf.cpp
+
+test_regconf.obj : [.config]regconf.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.config]regconf.cpp
+
+test_datetimetest.obj : [.datetime]datetimetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS)/warn=(disable=INTSIGNCHANGE)\
+	[.datetime]datetimetest.cpp
+
+test_evthandler.obj : [.events]evthandler.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.events]evthandler.cpp
+
+test_evtsource.obj : [.events]evtsource.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.events]evtsource.cpp
+
+test_stopwatch.obj : [.events]stopwatch.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.events]stopwatch.cpp
+
+test_timertest.obj : [.events]timertest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.events]timertest.cpp
+
+test_exec.obj : [.exec]exec.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.exec]exec.cpp
+
+test_dir.obj : [.file]dir.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.file]dir.cpp
+
+test_filefn.obj : [.file]filefn.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.file]filefn.cpp
+
+test_filetest.obj : [.file]filetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.file]filetest.cpp
+
+test_filekind.obj : [.filekind]filekind.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.filekind]filekind.cpp
+
+test_filenametest.obj : [.filename]filenametest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.filename]filenametest.cpp
+
+test_filesystest.obj : [.filesys]filesystest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.filesys]filesystest.cpp
+
+test_fontmaptest.obj : [.fontmap]fontmaptest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.fontmap]fontmaptest.cpp
+
+test_formatconvertertest.obj : [.formatconverter]formatconvertertest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.formatconverter]formatconvertertest.cpp
+
+test_hashes.obj : [.hashes]hashes.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.hashes]hashes.cpp
+
+test_output.obj : [.interactive]output.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.interactive]output.cpp
+
+test_input.obj : [.interactive]input.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.interactive]input.cpp
+
+test_intltest.obj : [.intl]intltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.intl]intltest.cpp
+
+test_lists.obj : [.lists]lists.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.lists]lists.cpp
+
+test_logtest.obj : [.log]logtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.log]logtest.cpp
+
+test_longlongtest.obj : [.longlong]longlongtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.longlong]longlongtest.cpp
+
+test_convautotest.obj : [.mbconv]convautotest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.mbconv]convautotest.cpp
+
+test_mbconvtest.obj : [.mbconv]mbconvtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.mbconv]mbconvtest.cpp
+
+test_dynamiclib.obj : [.misc]dynamiclib.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]dynamiclib.cpp
+
+test_environ.obj : [.misc]environ.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]environ.cpp
+
+test_metatest.obj : [.misc]metatest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]metatest.cpp
+
+test_misctests.obj : [.misc]misctests.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]misctests.cpp
+
+test_module.obj : [.misc]module.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]module.cpp
+
+test_pathlist.obj : [.misc]pathlist.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]pathlist.cpp
+
+test_typeinfotest.obj : [.misc]typeinfotest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.misc]typeinfotest.cpp
+
+test_ipc.obj : [.net]ipc.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.net]ipc.cpp
+
+test_socket.obj : [.net]socket.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS)/warn=(disable=REFTEMPORARY)\
+	[.net]socket.cpp
+
+test_regextest.obj : [.regex]regextest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.regex]regextest.cpp
+
+test_wxregextest.obj : [.regex]wxregextest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.regex]wxregextest.cpp
+
+test_scopeguardtest.obj : [.scopeguard]scopeguardtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.scopeguard]scopeguardtest.cpp
+
+test_iostream.obj : [.strings]iostream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]iostream.cpp
+
+test_strings.obj : [.strings]strings.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS)/warn=(disable=INTSIGNCHANGE)\
+	[.strings]strings.cpp
+
+test_stdstrings.obj : [.strings]stdstrings.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]stdstrings.cpp
+
+test_tokenizer.obj : [.strings]tokenizer.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]tokenizer.cpp
+
+test_unichar.obj : [.strings]unichar.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]unichar.cpp
+
+test_unicode.obj : [.strings]unicode.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]unicode.cpp
+
+test_crt.obj : [.strings]crt.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]crt.cpp
+
+test_vsnprintf.obj : [.strings]vsnprintf.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.strings]vsnprintf.cpp
+
+test_bstream.obj : [.streams]bstream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]bstream.cpp
+
+test_datastreamtest.obj : [.streams]datastreamtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]datastreamtest.cpp
+
+test_ffilestream.obj : [.streams]ffilestream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]ffilestream.cpp
+
+test_fileback.obj : [.streams]fileback.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]fileback.cpp
+
+test_filestream.obj : [.streams]filestream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]filestream.cpp
+
+test_iostreams.obj : [.streams]iostreams.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]iostreams.cpp
+
+test_largefile.obj : [.streams]largefile.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS)/warn=(disable=INTSIGNCHANGE)\
+	[.streams]largefile.cpp
+
+test_memstream.obj : [.streams]memstream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]memstream.cpp
+
+test_socketstream.obj : [.streams]socketstream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]socketstream.cpp
+
+test_sstream.obj : [.streams]sstream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]sstream.cpp
+
+test_stdstream.obj : [.streams]stdstream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]stdstream.cpp
+
+test_tempfile.obj : [.streams]tempfile.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]tempfile.cpp
+
+test_textstreamtest.obj : [.streams]textstreamtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]textstreamtest.cpp
+
+test_zlibstream.obj : [.streams]zlibstream.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.streams]zlibstream.cpp
+
+test_textfiletest.obj : [.textfile]textfiletest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.textfile]textfiletest.cpp
+
+test_atomic.obj : [.thread]atomic.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.thread]atomic.cpp
+
+test_misc.obj : [.thread]misc.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.thread]misc.cpp
+
+test_queue.obj : [.thread]queue.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.thread]queue.cpp
+
+test_tls.obj : [.thread]tls.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.thread]tls.cpp
+
+test_ftp.obj : [.uris]ftp.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.uris]ftp.cpp
+
+test_uris.obj : [.uris]uris.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.uris]uris.cpp
+
+test_url.obj : [.uris]url.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.uris]url.cpp
+
+test_vectors.obj : [.vectors]vectors.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.vectors]vectors.cpp
+
+test_evtconnection.obj : [.weakref]evtconnection.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.weakref]evtconnection.cpp
+
+test_weakref.obj : [.weakref]weakref.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.weakref]weakref.cpp
+
+test_xlocale.obj : [.xlocale]xlocale.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.xlocale]xlocale.cpp
+
+test_xmltest.obj : [.xml]xmltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_CXXFLAGS) [.xml]xmltest.cpp
+
+test_gui_sample_rc.obj : [...]samples]sample.rc 
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) $(__DEBUG_DEFINE_p_5)  $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir [...]samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)]include
+
+test_gui_asserthelper.obj : asserthelper.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) asserthelper.cpp
+
+test_gui_test.obj : test.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) test.cpp
+
+test_gui_testableframe.obj : testableframe.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) testableframe.cpp
+
+test_gui_rect.obj : [.geometry]rect.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.geometry]rect.cpp
+
+test_gui_size.obj : [.geometry]size.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.geometry]size.cpp
+
+test_gui_point.obj : [.geometry]point.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.geometry]point.cpp
+
+test_gui_bitmap.obj : [.graphics]bitmap.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.graphics]bitmap.cpp
+
+test_gui_colour.obj : [.graphics]colour.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.graphics]colour.cpp
+
+test_gui_ellipsization.obj : [.graphics]ellipsization.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.graphics]ellipsization.cpp
+
+test_gui_measuring.obj : [.graphics]measuring.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.graphics]measuring.cpp
+
+test_gui_config.obj : [.config]config.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.config]config.cpp
+
+test_gui_bitmapcomboboxtest.obj : [.controls]bitmapcomboboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]bitmapcomboboxtest.cpp
+
+test_gui_bitmaptogglebuttontest.obj : [.controls]bitmaptogglebuttontest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]bitmaptogglebuttontest.cpp
+
+test_gui_bookctrlbasetest.obj : [.controls]bookctrlbasetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]bookctrlbasetest.cpp
+
+test_gui_buttontest.obj : [.controls]buttontest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]buttontest.cpp
+
+test_gui_checkboxtest.obj : [.controls]checkboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]checkboxtest.cpp
+
+test_gui_checklistboxtest.obj : [.controls]checklistboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]checklistboxtest.cpp
+
+test_gui_choicebooktest.obj : [.controls]choicebooktest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]choicebooktest.cpp
+
+test_gui_choicetest.obj : [.controls]choicetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]choicetest.cpp
+
+test_gui_comboboxtest.obj : [.controls]comboboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]comboboxtest.cpp
+
+test_gui_frametest.obj : [.controls]frametest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]frametest.cpp
+
+test_gui_gaugetest.obj : [.controls]gaugetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]gaugetest.cpp
+
+test_gui_gridtest.obj : [.controls]gridtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]gridtest.cpp
+
+test_gui_headerctrltest.obj : [.controls]headerctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]headerctrltest.cpp
+
+test_gui_htmllboxtest.obj : [.controls]htmllboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]htmllboxtest.cpp
+
+test_gui_hyperlinkctrltest.obj : [.controls]hyperlinkctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]hyperlinkctrltest.cpp
+
+test_gui_itemcontainertest.obj : [.controls]itemcontainertest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]itemcontainertest.cpp
+
+test_gui_label.obj : [.controls]label.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]label.cpp
+
+test_gui_listbasetest.obj : [.controls]listbasetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]listbasetest.cpp
+
+test_gui_listbooktest.obj : [.controls]listbooktest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]listbooktest.cpp
+
+test_gui_listboxtest.obj : [.controls]listboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]listboxtest.cpp
+
+test_gui_listctrltest.obj : [.controls]listctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]listctrltest.cpp
+
+test_gui_listviewtest.obj : [.controls]listviewtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]listviewtest.cpp
+
+test_gui_notebooktest.obj : [.controls]notebooktest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]notebooktest.cpp
+
+test_gui_pickerbasetest.obj : [.controls]pickerbasetest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]pickerbasetest.cpp
+
+test_gui_pickertest.obj : [.controls]pickertest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]pickertest.cpp
+
+test_gui_radioboxtest.obj : [.controls]radioboxtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]radioboxtest.cpp
+
+test_gui_radiobuttontest.obj : [.controls]radiobuttontest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]radiobuttontest.cpp
+
+test_gui_rearrangelisttest.obj : [.controls]rearrangelisttest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]rearrangelisttest.cpp
+
+test_gui_richtextctrltest.obj : [.controls]richtextctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]richtextctrltest.cpp
+
+test_gui_slidertest.obj : [.controls]slidertest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]slidertest.cpp
+
+test_gui_spinctrldbltest.obj : [.controls]spinctrldbltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]spinctrldbltest.cpp
+
+test_gui_spinctrltest.obj : [.controls]spinctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]spinctrltest.cpp
+
+test_gui_textctrltest.obj : [.controls]textctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]textctrltest.cpp
+
+test_gui_textentrytest.obj : [.controls]textentrytest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]textentrytest.cpp
+
+test_gui_togglebuttontest.obj : [.controls]togglebuttontest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]togglebuttontest.cpp
+
+test_gui_toolbooktest.obj : [.controls]toolbooktest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]toolbooktest.cpp
+
+test_gui_treebooktest.obj : [.controls]treebooktest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]treebooktest.cpp
+
+test_gui_treectrltest.obj : [.controls]treectrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]treectrltest.cpp
+
+test_gui_virtlistctrltest.obj : [.controls]virtlistctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]virtlistctrltest.cpp
+
+test_gui_windowtest.obj : [.controls]windowtest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]windowtest.cpp
+
+test_gui_clone.obj : [.events]clone.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.events]clone.cpp
+
+test_gui_propagation.obj : [.events]propagation.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.events]propagation.cpp
+
+test_gui_keyboard.obj : [.events]keyboard.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.events]keyboard.cpp
+
+test_gui_fonttest.obj : [.font]fonttest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.font]fonttest.cpp
+
+test_gui_image.obj : [.image]image.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.image]image.cpp
+
+test_gui_rawbmp.obj : [.image]rawbmp.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.image]rawbmp.cpp
+
+test_gui_htmlwindow.obj : [.html]htmlwindow.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.html]htmlwindow.cpp
+
+test_gui_accelentry.obj : [.menu]accelentry.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.menu]accelentry.cpp
+
+test_gui_menu.obj : [.menu]menu.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.menu]menu.cpp
+
+test_gui_guifuncs.obj : [.misc]guifuncs.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.misc]guifuncs.cpp
+
+test_gui_selstoretest.obj : [.misc]selstoretest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.misc]selstoretest.cpp
+
+test_gui_garbage.obj : [.misc]garbage.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.misc]garbage.cpp
+
+test_gui_settings.obj : [.misc]settings.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.misc]settings.cpp
+
+test_gui_socket.obj : [.net]socket.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS)/warn=(disable=REFTEMPORARY)\
+	[.net]socket.cpp
+
+test_gui_boxsizer.obj : [.sizers]boxsizer.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.sizers]boxsizer.cpp
+
+test_gui_clientsize.obj : [.window]clientsize.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.window]clientsize.cpp
+
+test_gui_setsize.obj : [.window]setsize.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.window]setsize.cpp
+
+test_gui_xrctest.obj : [.xml]xrctest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.xml]xrctest.cpp
+
diff --git a/tests/testprec.h b/tests/testprec.h
index e597e6b9ac..e45b48bb10 100644
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -1,3 +1,6 @@
+#ifndef WX_TESTPREC_INCLUDED
+#define WX_TESTPREC_INCLUDED 1
+
 #include "wx/wxprec.h"
 #include "wx/cppunit.h"
 
@@ -137,3 +140,5 @@ private:
         CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ ); \
     static CPPUNIT_NS::AutoRegisterSuite< name##TestCase > \
         CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterNamedRegistry__ )(#name "TestCase")
+
+#endif