From: Jouk Jansen Date: Wed, 9 Aug 2000 09:51:03 +0000 (+0000) Subject: Committing in . X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/57681e5bfdb903d4b4a9d4eba284b414ba93e059?ds=inline Committing in . Modified Files: wxWindows/src/common/descrip.mms wxWindows/src/generic/descrip.mms wxWindows/src/unix/utilsunx.cpp Updates for VMS ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/descrip.mms b/src/common/descrip.mms index d312a20810..ba0d4ed855 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -116,6 +116,7 @@ OBJECTS1=framecmn.obj,\ textfile.obj,\ timercmn.obj,\ tokenzr.obj,\ + treebase.obj,\ txtstrm.obj,\ unzip.obj,\ url.obj,\ @@ -214,6 +215,7 @@ SOURCES = \ textfile.cpp,\ timercmn.cpp,\ tokenzr.cpp,\ + treebase.cpp,\ txtstrm.cpp,\ unzip.c,\ url.cpp,\ @@ -342,6 +344,7 @@ textcmn.obj : textcmn.cpp textfile.obj : textfile.cpp timercmn.obj : timercmn.cpp tokenzr.obj : tokenzr.cpp +treebase.obj : treebase.cpp txtstrm.obj : txtstrm.cpp unzip.obj : unzip.c url.obj : url.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 2aeaa0fe8c..e345360350 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -30,6 +30,7 @@ OBJECTS = \ choicdgg.obj,\ colrdlgg.obj,\ dcpsg.obj,\ + dirctrlg.obj,\ dirdlgg.obj,\ fontdlgg.obj,\ grid.obj,\ @@ -59,7 +60,7 @@ OBJECTS = \ tabg.obj,\ textdlgg.obj,\ tipdlg.obj,\ - treectrl.obj,\ + treectlg.obj,\ wizard.obj SOURCES = \ @@ -69,6 +70,7 @@ SOURCES = \ choicdgg.cpp,\ colrdlgg.cpp,\ dcpsg.cpp,\ + dirctrlg.cpp,\ dirdlgg.cpp,\ filedlgg.cpp,\ fontdlgg.cpp,\ @@ -101,7 +103,7 @@ SOURCES = \ tabg.cpp,\ textdlgg.cpp,\ tipdlg.cpp,\ - treectrl.cpp,\ + treectlg.cpp,\ wizard.cpp .ifdef __WXMOTIF__ @@ -128,6 +130,7 @@ caret.obj : caret.cpp choicdgg.obj : choicdgg.cpp colrdlgg.obj : colrdlgg.cpp dcpsg.obj : dcpsg.cpp +dirctrlg.obj : dirctrlg.cpp dirdlgg.obj : dirdlgg.cpp filedlgg.obj : filedlgg.cpp fontdlgg.obj : fontdlgg.cpp @@ -160,5 +163,5 @@ tbarsmpl.obj : tbarsmpl.cpp tabg.obj : tabg.cpp textdlgg.obj : textdlgg.cpp tipdlg.obj : tipdlg.cpp -treectrl.obj : treectrl.cpp +treectlg.obj : treectlg.cpp wizard.obj : wizard.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index dcd14f6e79..b2fa90d046 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -622,6 +622,13 @@ long wxExecute(wxChar **argv, return exitcode; #endif // wxUSE_GUI } +#ifdef __VMS + // VMS does not recognise exit as a return and complains about + // a missing return + // I think VMS is wrong in this + // JJ + return 0; +#endif } #undef ARGS_CLEANUP