Committing in .
Modified Files: wxWindows/descrip.mms wxWindows/setup.h_vms wxWindows/distrib/msw/makefile.rsp wxWindows/include/wx/dbgrid.h wxWindows/lib/vms_gtk.opt wxWindows/samples/db/dbtest.cpp wxWindows/src/common/descrip.mms wxWindows/src/generic/descrip.mms Added Files: wxWindows/samples/dialup/descrip.mms wxWindows/samples/docview/descrip.mms wxWindows/samples/font/descrip.mms dbgrid.h change as announced in the developer mailing list various OpenVMS complile issues ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2651,6 +2651,9 @@ void DisplayDbDiagnostics(wxDb *pDb)
|
||||
}
|
||||
s += "\n";
|
||||
|
||||
#ifdef __VMS__
|
||||
#pragma message disable incboodep
|
||||
#endif
|
||||
comma = FALSE;
|
||||
s += langDBINF_TXN_ISOLATION_OPTS;
|
||||
if (pDb->dbInf.txnIsolationOptions & SQL_TXN_READ_UNCOMMITTED)
|
||||
@@ -2758,6 +2761,9 @@ void DisplayDbDiagnostics(wxDb *pDb)
|
||||
if (pDb->dbInf.staticSensitivity & SQL_SS_UPDATES)
|
||||
{if (comma++) s += ", "; s += langDBINF_UPDATES;}
|
||||
s += "\n";
|
||||
#ifdef __VMS__
|
||||
#pragma message enable incboodep
|
||||
#endif
|
||||
|
||||
|
||||
s += langDBINF_TXN_CAPABLE;
|
||||
|
47
samples/dialup/descrip.mms
Normal file
47
samples/dialup/descrip.mms
Normal file
@@ -0,0 +1,47 @@
|
||||
#*****************************************************************************
|
||||
# *
|
||||
# Make file for VMS *
|
||||
# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) *
|
||||
# Date : 2 November 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) nettest.exe
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
$(MMS)$(MMSQUALIFIERS) nettest_gtk.exe
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.ifdef __WXMOTIF__
|
||||
nettest.exe : nettest.obj
|
||||
cxxlink nettest,[--.lib]vms/opt
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
nettest_gtk.exe : nettest.obj
|
||||
cxxlink/exec=nettest_gtk.exe nettest,[--.lib]vms_gtk/opt
|
||||
.endif
|
||||
.endif
|
||||
|
||||
nettest.obj : nettest.cpp
|
49
samples/docview/descrip.mms
Normal file
49
samples/docview/descrip.mms
Normal file
@@ -0,0 +1,49 @@
|
||||
#*****************************************************************************
|
||||
# *
|
||||
# Make file for VMS *
|
||||
# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) *
|
||||
# Date : 2 November 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) docview.exe
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
$(MMS)$(MMSQUALIFIERS) docview_gtk.exe
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.ifdef __WXMOTIF__
|
||||
docview.exe : docview.obj,doc.obj,view.obj
|
||||
cxxlink docview,doc,view,[--.lib]vms/opt
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
docview_gtk.exe : docview.obj,doc.obj,view.obj
|
||||
cxxlink/exec=docview_gtk.exe docview,doc,view,[--.lib]vms_gtk/opt
|
||||
.endif
|
||||
.endif
|
||||
|
||||
docview.obj : docview.cpp
|
||||
view.obj : view.cpp
|
||||
doc.obj : doc.cpp
|
47
samples/font/descrip.mms
Normal file
47
samples/font/descrip.mms
Normal file
@@ -0,0 +1,47 @@
|
||||
#*****************************************************************************
|
||||
# *
|
||||
# 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) font.exe
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
$(MMS)$(MMSQUALIFIERS) font_gtk.exe
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.ifdef __WXMOTIF__
|
||||
font.exe : font.obj
|
||||
cxxlink font,[--.lib]vms/opt
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
font_gtk.exe : font.obj
|
||||
cxxlink/exec=font_gtk.exe font,[--.lib]vms_gtk/opt
|
||||
.endif
|
||||
.endif
|
||||
|
||||
font.obj : font.cpp
|
Reference in New Issue
Block a user