Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.

[wxWidgets.git] / samples / image / descrip.mms

diff --git a/samples/image/descrip.mms b/samples/image/descrip.mms
index 5a922790795edf96602948c2b576bb303ab340db..4a1893b0daf81238e59d0f125f77360571e06f2c 100644 (file)
--- a/samples/image/descrip.mms
+++ b/samples/image/descrip.mms
@@ -1,18 +1,24 @@
 #*****************************************************************************
 #                                                                            *
 # 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 : 19 January 2009                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+          /assume=(nostdnew,noglobal_array_new)
+.else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
 .else
 CXX_DEFINE =
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -20,11 +26,23 @@ CXX_DEFINE =
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 
 all :
+.ifdef __WXMOTIF__
        $(MMS)$(MMSQUALIFIERS) image.exe
+.else
+.ifdef __WXGTK__
+       $(MMS)$(MMSQUALIFIERS) image_gtk.exe
+.endif
+.endif
 
-image.exe : image.obj
 .ifdef __WXMOTIF__
-       cxxlink image,[--.lib]vms/opt
+image.exe : image.obj,canvas.obj
+       cxxlink image,canvas,[--.lib]vms/opt
+.else
+.ifdef __WXGTK__
+image_gtk.exe : image.obj,canvas.obj
+       cxxlink/exec=image_gtk.exe image,canvas,[--.lib]vms_gtk/opt
+.endif
 .endif
 
 image.obj : image.cpp
+canvas.obj : canvas.cpp