diff --git a/descrip.mms b/descrip.mms
index f10828c15c..e452e30cf1 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 7 October 2009                                                      *
+# Date : 9 October 2009                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -108,8 +108,14 @@ gtk : [.include.wx]setup.h
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.docview]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+	set default [-.dragimag]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.drawing]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+	set default [-.erase]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+	set default [-.event]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.font]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.image]
diff --git a/samples/dragimag/descrip.mms b/samples/dragimag/descrip.mms
new file mode 100644
index 0000000000..1583fe1335
--- /dev/null
+++ b/samples/dragimag/descrip.mms
@@ -0,0 +1,77 @@
+#*****************************************************************************
+#                                                                            *
+# Make file for VMS                                                          *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 9 October 2009                                                      *
+#                                                                            *
+#*****************************************************************************
+.first
+	define wx [--.include.wx]
+
+.ifdef __WXMOTIF__
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+CXX_DEFINE =
+.endif
+.endif
+.endif
+.endif
+
+.suffixes : .cpp
+
+.cpp.obj :
+	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+
+all :
+.ifdef __WXMOTIF__
+	$(MMS)$(MMSQUALIFIERS) dragimag.exe
+.else
+.ifdef __WXGTK__
+	$(MMS)$(MMSQUALIFIERS) dragimag_gtk.exe
+.else
+.ifdef __WXGTK2__
+	$(MMS)$(MMSQUALIFIERS) dragimag_gtk2.exe
+.else
+.ifdef __WXX11__
+	$(MMS)$(MMSQUALIFIERS) dragimag_x11.exe
+.endif
+.endif
+.endif
+.endif
+
+OBJS=dragimag.obj
+
+.ifdef __WXMOTIF__
+dragimag.exe : $(OBJS)
+	cxxlink $(OBJS),[--.lib]vms/opt
+.else
+.ifdef __WXGTK__
+dragimag_gtk.exe : $(OBJS)
+	cxxlink/exec=dragimag_gtk.exe $(OBJS),[--.lib]vms_gtk/opt
+.else
+.ifdef __WXGTK2__
+dragimag_gtk2.exe : $(OBJS)
+	cxxlink/exec=dragimag_gtk2.exe $(OBJS),[--.lib]vms_gtk2/opt
+.else
+.ifdef __WXX11__
+dragimag_x11.exe : $(OBJS)
+	cxxlink/exec=dragimag_x11.exe $(OBJS),[--.lib]vms_x11_univ/opt
+.endif
+.endif
+.endif
+.endif
+
+dragimag.obj : dragimag.cpp
diff --git a/samples/erase/descrip.mms b/samples/erase/descrip.mms
index 5175f4952c..31b0672afa 100644
--- a/samples/erase/descrip.mms
+++ b/samples/erase/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 9 October 2009                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -10,15 +10,25 @@
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
 .else
 .ifdef __WXGTK__
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)/incl=([],[-])
 .else
 CXX_DEFINE =
 .endif
 .endif
+.endif
+.endif
 
 .suffixes : .cpp
 
@@ -27,21 +37,41 @@ CXX_DEFINE =
 
 all :
 .ifdef __WXMOTIF__
-	$(MMS)$(MMSQUALIFIERS) minimal.exe
+	$(MMS)$(MMSQUALIFIERS) erase.exe
 .else
 .ifdef __WXGTK__
-	$(MMS)$(MMSQUALIFIERS) minimal_gtk.exe
+	$(MMS)$(MMSQUALIFIERS) erase_gtk.exe
+.else
+.ifdef __WXGTK2__
+	$(MMS)$(MMSQUALIFIERS) erase_gtk2.exe
+.else
+.ifdef __WXX11__
+	$(MMS)$(MMSQUALIFIERS) erase_x11.exe
 .endif
 .endif
+.endif
+.endif
+
+OBJS=erase.obj
 
 .ifdef __WXMOTIF__
-minimal.exe : minimal.obj
-	cxxlink minimal,[--.lib]vms/opt
+erase.exe : $(OBJS)
+	cxxlink $(OBJS),[--.lib]vms/opt
 .else
 .ifdef __WXGTK__
-minimal_gtk.exe : minimal.obj
-	cxxlink/exec=minimal_gtk.exe minimal,[--.lib]vms_gtk/opt
+erase_gtk.exe : $(OBJS)
+	cxxlink/exec=erase_gtk.exe $(OBJS),[--.lib]vms_gtk/opt
+.else
+.ifdef __WXGTK2__
+erase_gtk2.exe : $(OBJS)
+	cxxlink/exec=erase_gtk2.exe $(OBJS),[--.lib]vms_gtk2/opt
+.else
+.ifdef __WXX11__
+erase_x11.exe : $(OBJS)
+	cxxlink/exec=erase_x11.exe $(OBJS),[--.lib]vms_x11_univ/opt
+.endif
+.endif
 .endif
 .endif
 
-minimal.obj : minimal.cpp
+erase.obj : erase.cpp
diff --git a/samples/event/descrip.mms b/samples/event/descrip.mms
new file mode 100644
index 0000000000..76e1dda271
--- /dev/null
+++ b/samples/event/descrip.mms
@@ -0,0 +1,77 @@
+#*****************************************************************************
+#                                                                            *
+# Make file for VMS                                                          *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 9 October 2009                                                      *
+#                                                                            *
+#*****************************************************************************
+.first
+	define wx [--.include.wx]
+
+.ifdef __WXMOTIF__
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)/incl=([],[-])
+.else
+CXX_DEFINE =
+.endif
+.endif
+.endif
+.endif
+
+.suffixes : .cpp
+
+.cpp.obj :
+	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+
+all :
+.ifdef __WXMOTIF__
+	$(MMS)$(MMSQUALIFIERS) event.exe
+.else
+.ifdef __WXGTK__
+	$(MMS)$(MMSQUALIFIERS) event_gtk.exe
+.else
+.ifdef __WXGTK2__
+	$(MMS)$(MMSQUALIFIERS) event_gtk2.exe
+.else
+.ifdef __WXX11__
+	$(MMS)$(MMSQUALIFIERS) event_x11.exe
+.endif
+.endif
+.endif
+.endif
+
+OBJS=event.obj
+
+.ifdef __WXMOTIF__
+event.exe : $(OBJS)
+	cxxlink $(OBJS),[--.lib]vms/opt
+.else
+.ifdef __WXGTK__
+event_gtk.exe : $(OBJS)
+	cxxlink/exec=event_gtk.exe $(OBJS),[--.lib]vms_gtk/opt
+.else
+.ifdef __WXGTK2__
+event_gtk2.exe : $(OBJS)
+	cxxlink/exec=event_gtk2.exe $(OBJS),[--.lib]vms_gtk2/opt
+.else
+.ifdef __WXX11__
+event_x11.exe : $(OBJS)
+	cxxlink/exec=event_x11.exe $(OBJS),[--.lib]vms_x11_univ/opt
+.endif
+.endif
+.endif
+.endif
+
+event.obj : event.cpp
diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index eebdae6ef3..253d011b7e 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 : 8 October 2009                                                      *
+# Date : 9 October 2009                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -93,7 +93,7 @@ OBJECTS = \
 		bmpcboxg.obj,\
 		filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\
 		grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
-		editlbox.obj,datavgen.obj,dbgrptg.obj
+		editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj
 
 SOURCES = \
 		aboutdlgg.cpp,\
@@ -164,7 +164,7 @@ SOURCES = \
 		vscroll.cpp,\
 		icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\
 		,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
-		datavgen.cpp,dbgrptg.cpp
+		datavgen.cpp,dbgrptg.cpp,dragimgg.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
@@ -295,3 +295,4 @@ grideditors.obj : grideditors.cpp
 infobar.obj : infobar.cpp
 datavgen.obj : datavgen.cpp
 dbgrptg.obj : dbgrptg.cpp
+dragimgg.obj : dragimgg.cpp