From 0df4f2ffa0c351e509715d8e870ff516bcc492cb Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Wed, 8 May 2002 12:42:24 +0000 Subject: [PATCH] Committing in . updates for OpenVMS Modified Files: wxWindows/src/common/descrip.mms wxWindows/src/motif/clipbrd.cpp Added Files: wxWindows/samples/db/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/db/descrip.mms | 48 ++++++++++++++++++++++++++++++++++++++++++ src/common/descrip.mms | 3 +++ src/motif/clipbrd.cpp | 8 +++++-- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 samples/db/descrip.mms diff --git a/samples/db/descrip.mms b/samples/db/descrip.mms new file mode 100755 index 0000000000..cbae353383 --- /dev/null +++ b/samples/db/descrip.mms @@ -0,0 +1,48 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * +# Date : 31 October 2001 * +# * +#***************************************************************************** +.first + define wx [--.include.wx] + +.ifdef __WXMOTIF__ +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 + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp + +all : +.ifdef __WXMOTIF__ + $(MMS)$(MMSQUALIFIERS) dbtest.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) dbtest_gtk.exe +.endif +.endif + +.ifdef __WXMOTIF__ +dbtest.exe : dbtest.obj,listdb.obj + cxxlink dbtest,listdb,[--.lib]vms/opt +.else +.ifdef __WXGTK__ +dbtest_gtk.exe : dbtest.obj,listdb.obj + cxxlink/exec=dbtest_gtk.exe dbtest,listdb,[--.lib]vms_gtk/opt +.endif +.endif + +dbtest.obj : dbtest.cpp +listdb.obj : listdb.cpp diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 044ad827e8..a4a2fdc2c2 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -135,6 +135,7 @@ OBJECTS1=fs_inet.obj,\ sckstrm.obj,\ sizer.obj,\ socket.obj,\ + settcmn.obj,\ statbar.obj,\ strconv.obj,\ stream.obj,\ @@ -255,6 +256,7 @@ SOURCES = \ sckstrm.cpp,\ sizer.cpp,\ socket.cpp,\ + settcmn.cpp,\ statbar.cpp,\ strconv.cpp,\ stream.cpp,\ @@ -413,6 +415,7 @@ sckipc.obj : sckipc.cpp sckstrm.obj : sckstrm.cpp sizer.obj : sizer.cpp socket.obj : socket.cpp +settcmn.obj : settcmn.cpp statbar.obj : statbar.cpp strconv.obj : strconv.cpp stream.obj : stream.cpp diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index 41afb324d3..0ee8acb958 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -366,10 +366,14 @@ bool wxClipboard::GetData( wxDataObject& data ) */ default: { - return FALSE; +#ifndef __VMS + // VMS complains that this statement is/causes unreachability + return FALSE; +#endif } } - return FALSE; + + return FALSE; } #if 0 -- 2.45.2