From 6804a3f7197d4720e4c2fc812af2ae364986c07b Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Thu, 24 Apr 2003 13:48:51 +0000 Subject: [PATCH] Committing in . Updated OpenVMS compile support Modified Files: wxWindows/descrip.mms wxWindows/setup.h_vms wxWindows/src/common/descrip.mms wxWindows/src/generic/descrip.mms wxWindows/src/gtk/descrip.mms wxWindows/utils/dialoged/src/descrip.mms Added Files: wxWindows/contrib/src/deprecated/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/deprecated/descrip.mms | 91 ++++++++++++++++++++++++++++++ descrip.mms | 21 ++++--- setup.h_vms | 58 ++++++++++++------- src/common/descrip.mms | 34 ++--------- src/generic/descrip.mms | 9 --- src/gtk/descrip.mms | 5 +- src/gtk1/descrip.mms | 5 +- utils/dialoged/src/descrip.mms | 4 +- 8 files changed, 157 insertions(+), 70 deletions(-) create mode 100644 contrib/src/deprecated/descrip.mms diff --git a/contrib/src/deprecated/descrip.mms b/contrib/src/deprecated/descrip.mms new file mode 100644 index 0000000000..c06d58f71b --- /dev/null +++ b/contrib/src/deprecated/descrip.mms @@ -0,0 +1,91 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * +# Date : 24 April 2003 * +# * +#***************************************************************************** +.first + define wx [---.include.wx] + set command $disk2:[joukj.com]bison.cld + +.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__ +.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 +.else +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 +.endif +.else +CXX_DEFINE = +CC_DEFINE = +.endif +.endif + +YACC=bison/yacc + +SED=gsed + +LEX=flex + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp +.c.obj : + cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c + +OBJECTS=prop.obj,propform.obj,proplist.obj,wxexpr.obj,parser.obj,resource.obj,\ + treelay.obj + +SOURCES=prop.cpp,propform.cpp,proplist.cpp,wxexpr.cpp,parser.y,resource.cpp,\ + treelay.cpp + +all : $(SOURCES) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS) +.ifdef __WXMOTIF__ + library/crea [---.lib]libwx_motif_deprecated.olb $(OBJECTS) +.else +.ifdef __WXGTK__ +.ifdef __WXUNIVERSAL__ + library/crea [---.lib]libwx_gtk_univ_deprecated.olb $(OBJECTS) +.else + library/crea [---.lib]libwx_gtk_deprecated.olb $(OBJECTS) +.endif +.endif +.endif + +prop.obj : prop.cpp +propform.obj : propform.cpp +proplist.obj : proplist.cpp +wxexpr.obj : wxexpr.cpp +parser.obj : parser.c lexer.c +parser.c : parser.y lexer.c + $(YACC) parser.y + pipe $(SED) -e "s;y_tab.c;parser.y;g" < y_tab.c | \ + $(SED) -e "s/BUFSIZ/5000/g" | \ + $(SED) -e "s/YYLMAX 200/YYLMAX 5000/g" | \ + $(SED) -e "s/yy/PROIO_yy/g" | \ + $(SED) -e "s/input/PROIO_input/g" | \ + $(SED) -e "s/unput/PROIO_unput/g" > parser.c + delete y_tab.c;* + +lexer.c : lexer.l + $(LEX) lexer.l + pipe $(SED) -e "s;lexyy.c;lexer.l;g" < lexyy.c | \ + $(SED) -e "s/yy/PROIO_yy/g" | \ + $(SED) -e "s/input/PROIO_input/g" | \ + $(SED) -e "s/unput/PROIO_unput/g" > lexer.c + delete lexyy.c;* + +resource.obj : resource.cpp +treelay.obj : treelay.cpp diff --git a/descrip.mms b/descrip.mms index fb6d12e1c3..d87220b82d 100644 --- a/descrip.mms +++ b/descrip.mms @@ -14,6 +14,9 @@ set def [.wxwindows] all : + set default [.include.wx] + if f$search("DEPRECATED.DIR") .eqs. "" then set file/enter=[]deprecated.dir [--.contrib.include.wx]deprecated.dir + set default [--] make gtk purge [...] delete [...]*.obj; @@ -35,7 +38,9 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.gtk] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) - set default [--.demos.bombs] + set default [--.contrib.src.deprecated] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [---.demos.bombs] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--.samples.calendar] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) @@ -69,8 +74,6 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.minimal] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) - set default [-.resource] - $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.richedit] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--.utils.dialoged.src] @@ -90,7 +93,9 @@ univ : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) set default [-.univ] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) -# set default [--.demos.bombs] + set default [--.contrib.src.deprecated] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) +# set default [---.demos.bombs] # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # set default [--.samples.calendar] # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) @@ -124,8 +129,6 @@ univ : [.include.wx]setup.h # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # set default [-.minimal] # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) -# set default [-.resource] -# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # set default [-.richedit] # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # set default [--.utils.dialoged.src] @@ -143,7 +146,9 @@ motif : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.x11] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) - set default [--.demos.bombs] + set default [--.contrib.src.deprecated] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) + set default [---.demos.bombs] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [--.samples.calendar] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) @@ -163,8 +168,6 @@ motif : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [-.minimal] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) - set default [-.resource] - $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [--.utils.dialoged.src] $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [--] diff --git a/setup.h_vms b/setup.h_vms index dc7aae8e99..e023e9b334 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -63,6 +63,9 @@ byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN +/* Define this if your version of Motif is greater than 2.0 */ +/* #undef __WXMOTIF20__ */ + #ifdef __WXGTK__ /* Define this if your version of GTK+ is greater than 1.2 */ #define __WXGTK12__ 1 @@ -71,7 +74,7 @@ #define __WXGTK127__ 1 /* Define this if your version of GTK+ is greater than 1.3 */ -#undef __WXGTK20__ +/* #undef __WXGTK20__ */ #endif /* @@ -80,27 +83,29 @@ #define wxUSE_UNIX 1 #define __UNIX__ -#undef __LINUX__ -#undef __SGI__ -#undef __HPUX__ -#undef __SYSV__ -#undef __SVR4__ + #undef __AIX__ -#undef __SUN__ -#undef __SOLARIS__ -#undef __SUNOS__ -#define __ALPHA__ -#undef __IA64__ -#undef __OSF__ -#undef __DARWIN__ -#undef __NETBSD__ #undef __BSD__ +#undef __DARWIN__ +#undef __EMX__ #undef __FREEBSD__ +#undef __HPUX__ +#undef __LINUX__ +#undef __NETBSD__ #undef __OPENBSD__ -#define __VMS__ +#undef __OSF__ +#undef __SGI__ +#undef __SOLARIS__ +#undef __SUN__ +#undef __SUNOS__ +#undef __SVR4__ +#undef __SYSV__ #undef __ULTRIX__ -#undef __DATA_GENERAL__ -#undef __EMX__ +#undef __UNIXWARE__ +#define __VMS__ + +#undef __IA64__ +#define __ALPHA__ /* NanoX (with wxX11) */ #define wxUSE_NANOX 0 @@ -159,6 +164,11 @@ */ #define HAVE_EXPLICIT 1 +/* + * Define if your compiler supports const_cast<>() + */ +#define HAVE_CONST_CAST 1 + /* * Use regex support */ @@ -382,6 +392,11 @@ * Use this control */ #define wxUSE_CHOICE 1 +/* + * Use wxDisplay class + */ +#define wxUSE_DISPLAY ! + /* * Use this control */ @@ -391,12 +406,12 @@ */ #define wxUSE_GRID 1 /* - * Use this control + * Use the new prototype wxGrid classes + * (wxUSE_GRID must also be defined) */ #define wxUSE_NEW_GRID 1 /* - * Use the new prototype wxGrid classes - * (wxUSE_GRID must also be defined) + * Use wxImageList class */ #define wxUSE_IMAGLIST 1 /* @@ -1191,4 +1206,7 @@ /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */ #define wxHAS_WORKING_GTK_DC_BLIT 1 +/* Define this is you have X11/extensions/shape.h */ +#define HAVE_XSHAPE 1 + #endif /* __WX_SETUP_H__ */ diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 68d8ee528a..98fba4d950 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -7,7 +7,6 @@ #***************************************************************************** .first define wx [--.include.wx] - set command $disk2:[joukj.com]bison.cld .ifdef __WXMOTIF__ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ @@ -45,7 +44,6 @@ LEX=flex cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c OBJECTS = \ - parser.obj,\ appcmn.obj,\ artprov.obj,\ artstd.obj,\ @@ -60,6 +58,7 @@ OBJECTS = \ cshelp.obj,\ ctrlcmn.obj,\ ctrlsub.obj,\ + datacmn.obj,\ datetime.obj,\ datstrm.obj,\ db.obj,\ @@ -129,7 +128,6 @@ OBJECTS1=fs_inet.obj,\ process.obj,\ protocol.obj,\ quantize.obj,\ - resource.obj,\ sckaddr.obj,\ sckfile.obj,\ sckipc.obj,\ @@ -155,6 +153,7 @@ OBJECTS1=fs_inet.obj,\ url.obj OBJECTS2=utilscmn.obj,\ + rgncmn.obj,\ valgen.obj,\ validate.obj,\ valtext.obj,\ @@ -162,7 +161,6 @@ OBJECTS2=utilscmn.obj,\ wfstream.obj,\ wincmn.obj,\ wxchar.obj,\ - wxexpr.obj,\ xpmdecod.obj,\ zipstrm.obj,\ zstream.obj @@ -170,7 +168,6 @@ OBJECTS2=utilscmn.obj,\ OBJECTS_MOTIF=bmpbase.obj SOURCES = \ - parser.y,\ appcmn.cpp,\ artprov.cpp,\ artstd.cpp,\ @@ -186,6 +183,7 @@ SOURCES = \ cshelp.cpp,\ ctrlcmn.cpp,\ ctrlsub.cpp,\ + datacmn.cpp,\ datetime.cpp,\ datstrm.cpp,\ db.cpp,\ @@ -254,7 +252,7 @@ SOURCES = \ process.cpp,\ protocol.cpp,\ quantize.cpp,\ - resource.cpp,\ + rgncmn.cpp,\ sckaddr.cpp,\ sckfile.cpp,\ sckipc.cpp,\ @@ -286,7 +284,6 @@ SOURCES = \ wfstream.cpp,\ wincmn.cpp,\ wxchar.cpp,\ - wxexpr.cpp,\ xpmdecod.cpp,\ zipstrm.cpp,\ zstream.cpp @@ -315,25 +312,6 @@ all : $(SOURCES) .endif .endif -parser.obj : parser.c lexer.c -parser.c : parser.y lexer.c - $(YACC) parser.y - pipe $(SED) -e "s;y_tab.c;parser.y;g" < y_tab.c | \ - $(SED) -e "s/BUFSIZ/5000/g" | \ - $(SED) -e "s/YYLMAX 200/YYLMAX 5000/g" | \ - $(SED) -e "s/yy/PROIO_yy/g" | \ - $(SED) -e "s/input/PROIO_input/g" | \ - $(SED) -e "s/unput/PROIO_unput/g" > parser.c - delete y_tab.c;* - -lexer.c : lexer.l - $(LEX) lexer.l - pipe $(SED) -e "s;lexyy.c;lexer.l;g" < lexyy.c | \ - $(SED) -e "s/yy/PROIO_yy/g" | \ - $(SED) -e "s/input/PROIO_input/g" | \ - $(SED) -e "s/unput/PROIO_unput/g" > lexer.c - delete lexyy.c;* - appcmn.obj : appcmn.cpp artprov.obj : artprov.cpp artstd.obj : artstd.cpp @@ -349,6 +327,7 @@ containr.obj : containr.cpp cshelp.obj : cshelp.cpp ctrlcmn.obj : ctrlcmn.cpp ctrlsub.obj : ctrlsub.cpp +datacmn.obj : datacmn.cpp datetime.obj : datetime.cpp datstrm.obj : datstrm.cpp db.obj : db.cpp @@ -417,7 +396,7 @@ prntbase.obj : prntbase.cpp process.obj : process.cpp protocol.obj : protocol.cpp quantize.obj : quantize.cpp -resource.obj : resource.cpp +rgncmn.obj : rgncmn.cpp sckaddr.obj : sckaddr.cpp sckfile.obj : sckfile.cpp sckipc.obj : sckipc.cpp @@ -449,7 +428,6 @@ variant.obj : variant.cpp wfstream.obj : wfstream.cpp wincmn.obj : wincmn.cpp wxchar.obj : wxchar.cpp -wxexpr.obj : wxexpr.cpp xpmdecod.obj : xpmdecod.cpp zipstrm.obj : zipstrm.cpp zstream.obj : zstream.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index ccee2b72ea..08eb79db17 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -62,9 +62,6 @@ OBJECTS = \ printps.obj,\ prntdlgg.obj,\ progdlgg.obj,\ - prop.obj,\ - propform.obj,\ - proplist.obj,\ sashwin.obj,\ splitter.obj,\ tbarsmpl.obj,\ @@ -104,9 +101,6 @@ SOURCES = \ printps.cpp,\ prntdlgg.cpp,\ progdlgg.cpp,\ - prop.cpp,\ - propform.cpp,\ - proplist.cpp,\ sashwin.cpp,\ splitter.cpp,\ statline.cpp,\ @@ -171,9 +165,6 @@ panelg.obj : panelg.cpp printps.obj : printps.cpp prntdlgg.obj : prntdlgg.cpp progdlgg.obj : progdlgg.cpp -prop.obj : prop.cpp -propform.obj : propform.cpp -proplist.obj : proplist.cpp scrlwing.obj : scrlwing.cpp spinctlg.obj : spinctlg.cpp sashwin.obj : sashwin.cpp diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index c87ecab7ae..1587c695e7 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -88,7 +88,8 @@ OBJECTS0= \ stattext.obj,\ tbargtk.obj,\ textctrl.obj,\ - tglbtn.obj + tglbtn.obj,\ + msgdlg.obj SOURCES =\ app.cpp,\ @@ -125,6 +126,7 @@ SOURCES =\ mdi.cpp,\ menu.cpp,\ minifram.cpp,\ + msgdlg.cpp,\ notebook.cpp,\ pen.cpp,\ popupwin.cpp,\ @@ -193,6 +195,7 @@ gsockgtk.obj : gsockgtk.c icon.obj : icon.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 diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index c87ecab7ae..1587c695e7 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -88,7 +88,8 @@ OBJECTS0= \ stattext.obj,\ tbargtk.obj,\ textctrl.obj,\ - tglbtn.obj + tglbtn.obj,\ + msgdlg.obj SOURCES =\ app.cpp,\ @@ -125,6 +126,7 @@ SOURCES =\ mdi.cpp,\ menu.cpp,\ minifram.cpp,\ + msgdlg.cpp,\ notebook.cpp,\ pen.cpp,\ popupwin.cpp,\ @@ -193,6 +195,7 @@ gsockgtk.obj : gsockgtk.c icon.obj : icon.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 diff --git a/utils/dialoged/src/descrip.mms b/utils/dialoged/src/descrip.mms index 43ff25205e..034156ad57 100644 --- a/utils/dialoged/src/descrip.mms +++ b/utils/dialoged/src/descrip.mms @@ -39,11 +39,11 @@ OBJECTS=dialoged.obj,reseditr.obj,dlghndlr.obj,reswrite.obj,winprop.obj,\ .ifdef __WXMOTIF__ dialoged.exe : $(OBJECTS) - cxxlink $(OBJECTS),[---.lib]vms/opt + cxxlink $(OBJECTS),[---.lib]libwx_motif_deprecated/lib,vms/opt .else .ifdef __WXGTK__ dialoged_gtk.exe : $(OBJECTS) - cxxlink/exec=dialoged_gtk.exe $(OBJECTS),[---.lib]vms_gtk/opt + cxxlink/exec=dialoged_gtk.exe $(OBJECTS),[---.lib]libwx_gtk_deprecated/lib,vms_gtk/opt .endif .endif -- 2.45.2