From: Jouk Jansen Date: Tue, 19 Sep 2006 11:59:21 +0000 (+0000) Subject: Include "xrc" support properly for OpenVMS X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f97d937077802eb8a6256771332c34d23bcdfcba?ds=sidebyside Include "xrc" support properly for OpenVMS Modified Files: wxWidgets/descrip.mms wxWidgets/setup.h_vms wxWidgets/lib/VMS_GTK2.OPT wxWidgets/lib/VMS_X11_UNIV.OPT wxWidgets/lib/vms_gtk.opt wxWidgets/src/common/descrip.mms wxWidgets/src/generic/descrip.mms wxWidgets/src/gtk1/descrip.mms wxWidgets/src/motif/descrip.mms wxWidgets/src/xrc/descrip.mms Added Files: wxWidgets/samples/xrc/descrip.mms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/descrip.mms b/descrip.mms index 095bd6f41d..c2ed278f84 100644 --- a/descrip.mms +++ b/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 15 June 2006 * +# Date : 19 September 2006 * # * #***************************************************************************** .first @@ -87,6 +87,8 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.richedit] # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.xrc] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--] gtk2 : [.include.wx]setup.h diff --git a/lib/VMS_GTK2.OPT b/lib/VMS_GTK2.OPT index 20aed868c2..5150b511d2 100755 --- a/lib/VMS_GTK2.OPT +++ b/lib/VMS_GTK2.OPT @@ -4,6 +4,7 @@ sys$library:libpng.olb/lib sys$library:libz.olb/lib sys$library:tiff.olb/lib X11:libxpm.olb/lib +sys$library:expat.olb/lib sys$share:libgtk2.exe/share sys$share:libgdk-pixbuf.exe/share sys$share:libgdk2.exe/share diff --git a/lib/VMS_X11_UNIV.OPT b/lib/VMS_X11_UNIV.OPT index 1af83b555a..215150329e 100755 --- a/lib/VMS_X11_UNIV.OPT +++ b/lib/VMS_X11_UNIV.OPT @@ -3,6 +3,7 @@ sys$library:libjpeg.olb/lib sys$library:libpng.olb/lib sys$library:libz.olb/lib sys$library:tiff.olb/lib +sys$library:expat.olb/lib X11:libxpm.olb/lib sys$share:iodbc.exe/share sys$share:vms_jackets.exe/share diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt index 4c4404bed0..179cf79072 100644 --- a/lib/vms_gtk.opt +++ b/lib/vms_gtk.opt @@ -4,6 +4,7 @@ sys$library:libjpeg.olb/lib sys$library:libpng.olb/lib sys$library:libz.olb/lib sys$library:tiff.olb/lib +sys$library:expat.olb/lib X11:libxpm.olb/lib sys$share:iodbc.exe/share sys$share:libgtk.exe/share diff --git a/samples/xrc/descrip.mms b/samples/xrc/descrip.mms new file mode 100755 index 0000000000..5c4049fb6f --- /dev/null +++ b/samples/xrc/descrip.mms @@ -0,0 +1,81 @@ +#***************************************************************************** +# * +# Make file for VMS * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 14 September 2006 * +# * +#***************************************************************************** +.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 +.ifdef __WXGTK2__ +CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\ + /assume=(nostdnew,noglobal_array_new) +.else +.ifdef __WXX11__ +CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ + /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) +.else +CXX_DEFINE = +.endif +.endif +.endif +.endif + +.suffixes : .cpp + +.cpp.obj : + cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp + +all : +.ifdef __WXMOTIF__ + $(MMS)$(MMSQUALIFIERS) xrcdemo.exe +.else +.ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) xrcdemo_gtk.exe +.else +.ifdef __WXGTK2__ + $(MMS)$(MMSQUALIFIERS) xrcdemo_gtk2.exe +.else +.ifdef __WXX11__ + $(MMS)$(MMSQUALIFIERS) xrcdemo_x11.exe +.endif +.endif +.endif +.endif + +.ifdef __WXMOTIF__ +xrcdemo.exe : xrcdemo.obj,custclas.obj,derivdlg.obj,myframe.obj + cxxlink xrcdemo,custclas.obj,derivdlg.obj,myframe.obj,[--.lib]vms/opt +.else +.ifdef __WXGTK__ +xrcdemo_gtk.exe : xrcdemo.obj,custclas.obj,derivdlg.obj,myframe.obj + cxxlink/exec=xrcdemo_gtk.exe xrcdemo,custclas.obj,derivdlg.obj,\ + myframe.obj,[--.lib]vms_gtk/opt +.else +.ifdef __WXGTK2__ +xrcdemo_gtk2.exe : xrcdemo.obj,custclas.obj,derivdlg.obj,myframe.obj + cxxlink/exec=xrcdemo_gtk2.exe xrcdemo,custclas.obj,derivdlg.obj,\ + myframe.obj,[--.lib]vms_gtk2/opt +.else +.ifdef __WXX11__ +xrcdemo_x11.exe : xrcdemo.obj,custclas.obj,derivdlg.obj,myframe.obj + cxxlink/exec=xrcdemo_x11.exe xrcdemo,custclas.obj,derivdlg.obj,\ + myframe.obj,[--.lib]vms_x11_univ/opt +.endif +.endif +.endif +.endif + +xrcdemo.obj : xrcdemo.cpp +custclas.obj : custclas.cpp +derivdlg.obj : derivdlg.cpp +myframe.obj : myframe.cpp diff --git a/setup.h_vms b/setup.h_vms index c270f9e98c..a0c00f34d2 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -597,6 +597,21 @@ typedef pid_t GPid; */ #undef VA_LIST_IS_ARRAY +/* + * Define if the compiler supports variadic macros + */ +#define HAVE_VARIADIC_MACROS 1 + +#if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY) +/* + * Define if your compiler has std::wstring + */ +#deffine HAVE_STD_WSTRING 1 +/* + * Define if your compiler has compliant std::string::compare + */ +#define HAVE_STD_STRING_COMPARE 1 +#else /* * Define if your compiler has std::wstring */ @@ -605,6 +620,8 @@ typedef pid_t GPid; * Define if your compiler has compliant std::string::compare */ #undef HAVE_STD_STRING_COMPARE +#endif + /* * Define if your compiler has */ @@ -1132,6 +1149,14 @@ typedef pid_t GPid; /* Define this if you have wprintf() and related functions */ #define HAVE_WPRINTF 1 + +/* Define this if you have swprintf() */ +#define HAVE_SWPRINTF 1 + +/* Define if you have a _broken_ swprintf() declaration in the header, + * without a 'size_t max' parameter as second argument */ +#undef HAVE_BROKEN_SWPRINTF_DECL + /* Define this if you have vswprintf() and related functions */ #define HAVE_VSWPRINTF 1 @@ -1172,6 +1197,13 @@ typedef pid_t GPid; #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +/* Define if the system headers declare the type boolean (which will conflict + * with the jpeg headers unless HAVE_BOOLEAN is defined). */ +#undef HAVE_BOOLEAN + +/* Define if the header pbt.h is missing. */ +#undef NEED_PBT_H + #endif /* __WIN32__ */ /* --------------------------------------------------------* diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 5e88373aba..fca045f16f 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 18 August 2006 * +# Date : 19 September 2006 * # * #***************************************************************************** .first @@ -106,6 +106,7 @@ OBJECTS1=fs_inet.obj,\ fs_zip.obj,\ ftp.obj,\ gaugecmn.obj,\ + gbsizer.obj,\ gdicmn.obj,\ gifdecod.obj,\ hash.obj,\ @@ -188,7 +189,11 @@ OBJECTS2=tbarbase.obj,\ wincmn.obj,\ xpmdecod.obj,\ zipstrm.obj,\ - zstream.obj + zstream.obj,\ + clrpickercmn.obj,\ + filepickercmn.obj,\ + fontpickercmn.obj,\ + pickerbase.obj OBJECTS_MOTIF=radiocmn.obj @@ -254,6 +259,7 @@ SOURCES = \ fs_zip.cpp,\ ftp.cpp,\ gaugecmn.cpp,\ + gbsizer.cpp,\ gdicmn.cpp,\ gifdecod.cpp,\ hash.cpp,\ @@ -335,6 +341,10 @@ SOURCES = \ xpmdecod.cpp,\ zipstrm.cpp,\ zstream.cpp,\ + clrpickercmn.cpp,\ + filepickercmn.cpp,\ + fontpickercmn.cpp,\ + pickerbase.cpp,\ accesscmn.cpp,\ dndcmn.cpp,\ dpycmn.cpp,\ @@ -366,9 +376,11 @@ all : $(SOURCES) library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF) .else .ifdef __WXGTK__ + $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11) library [--.lib]libwx_gtk.olb $(OBJECTS) library [--.lib]libwx_gtk.olb $(OBJECTS1) library [--.lib]libwx_gtk.olb $(OBJECTS2) + library [--.lib]libwx_gtk.olb $(OBJECTS_X11) .else .ifdef __WXGTK2__ library [--.lib]libwx_gtk2.olb $(OBJECTS) @@ -440,6 +452,7 @@ fs_inet.obj : fs_inet.cpp fs_zip.obj : fs_zip.cpp ftp.obj : ftp.cpp gaugecmn.obj : gaugecmn.cpp +gbsizer.obj : gbsizer.cpp gdicmn.obj : gdicmn.cpp gifdecod.obj : gifdecod.cpp hash.obj : hash.cpp @@ -541,3 +554,7 @@ xtixml.obj : xtixml.cpp uri.obj : uri.cpp dpycmn.obj : dpycmn.cpp combocmn.obj : combocmn.cpp +clrpickercmn.obj : clrpickercmn.cpp +filepickercmn.obj : filepickercmn.cpp +fontpickercmn.obj : fontpickercmn.cpp +pickerbase.obj : pickerbase.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 50f50008cf..9618cb9ee7 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 18 August 2006 * +# Date : 19 September 2006 * # * #***************************************************************************** .first @@ -51,12 +51,14 @@ OBJECTS = \ choicbkg.obj,\ choicdgg.obj,\ colrdlgg.obj,\ + clrpickerg.obj,\ datectlg.obj,\ dcpsg.obj,\ dirctrlg.obj,\ dirdlgg.obj,\ fdrepdlg.obj,\ fontdlgg.obj,\ + fontpickerg.obj,\ grid.obj,\ gridctrl.obj,\ gridsel.obj,\ @@ -68,6 +70,7 @@ OBJECTS = \ logg.obj,\ msgdlgg.obj,\ numdlgg.obj,\ + odcombo.obj,\ panelg.obj,\ printps.obj,\ prntdlgg.obj,\ @@ -85,7 +88,9 @@ OBJECTS = \ toolbkg.obj,\ treebkg.obj,\ treectlg.obj,\ - wizard.obj + wizard.obj,\ + hyperlink.obj,\ + filepickerg.obj SOURCES = \ accel.cpp,\ @@ -95,6 +100,7 @@ SOURCES = \ choicbkg.cpp,\ choicdgg.cpp,\ colrdlgg.cpp,\ + clrpickerg.cpp,\ datectlg.cpp,\ dcpsg.cpp,\ dirctrlg.cpp,\ @@ -102,11 +108,11 @@ SOURCES = \ filedlgg.cpp,\ fdrepdlg.cpp,\ fontdlgg.cpp,\ + fontpickerg.cpp,\ grid.cpp,\ gridctrl.cpp,\ gridsel.cpp,\ helpext.cpp,\ - icon.cpp,\ imaglist.cpp,\ laywin.cpp,\ listbkg.cpp,\ @@ -115,6 +121,7 @@ SOURCES = \ msgdlgg.cpp,\ notebook.cpp,\ numdlgg.cpp,\ + odcombo.cpp,\ paletteg.cpp,\ panelg.cpp,\ printps.cpp,\ @@ -145,7 +152,10 @@ SOURCES = \ splash.cpp,\ timer.cpp,\ vlbox.cpp,\ - vscroll.cpp + hyperlink.cpp,\ + filepickerg.cpp,\ + vscroll.cpp,\ + icon.cpp .ifdef __WXMOTIF__ OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj @@ -155,7 +165,8 @@ OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\ listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\ vlbox.obj,vscroll.obj,combog.obj,icon.obj .else -OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,icon.obj +OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,vlbox.obj,\ + vscroll.obj,combog.obj,icon.obj .endif .endif @@ -182,6 +193,7 @@ busyinfo.obj : busyinfo.cpp calctrl.obj : calctrl.cpp caret.obj : caret.cpp choicdgg.obj : choicdgg.cpp +clrpickerg.obj : clrpickerg.cpp colrdlgg.obj : colrdlgg.cpp datectlg.obj : datectlg.cpp dcpsg.obj : dcpsg.cpp @@ -202,6 +214,7 @@ logg.obj : logg.cpp msgdlgg.obj : msgdlgg.cpp notebook.obj : notebook.cpp numdlgg.obj : numdlgg.cpp +odcombo.obj : odcombo.cpp paletteg.obj : paletteg.cpp panelg.obj : panelg.cpp printps.obj : printps.cpp @@ -239,3 +252,6 @@ choicbkg.obj : choicbkg.cpp toolbkg.obj : toolbkg.cpp treebkg.obj : treebkg.cpp combog.obj : combog.cpp +fontpickerg.obj : fontpickerg.cpp +hyperlink.obj : hyperlink.cpp +filepickerg.obj : filepickerg.cpp diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index ad6fc4340f..eae2497583 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 18 August 2006 * +# Date : 19 September 2006 * # * #***************************************************************************** .first @@ -43,8 +43,10 @@ OBJECTS = \ evtloop.obj,\ filedlg.obj,\ font.obj,\ + gdiobj.obj,\ glcanvas.obj,\ gsockgtk.obj,\ + icon.obj,\ main.obj,\ minifram.obj,\ pen.obj,\ @@ -120,8 +122,10 @@ SOURCES =\ fontdlg.cpp,\ frame.cpp,\ gauge.cpp,\ + gdiobj.cpp,\ glcanvas.cpp,\ gsockgtk.cpp,\ + icon.cpp,\ listbox.cpp,\ main.cpp,\ mdi.cpp,\ @@ -195,8 +199,10 @@ font.obj : font.cpp fontdlg.obj : fontdlg.cpp frame.obj : frame.cpp gauge.obj : gauge.cpp +gdiobj.obj : gdiobj.cpp glcanvas.obj : glcanvas.cpp gsockgtk.obj : gsockgtk.cpp +icon.obj : icon.cpp listbox.obj : listbox.cpp main.obj : main.cpp msgdlg.obj : msgdlg.cpp diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms index 7292889734..d7e26cc7a8 100644 --- a/src/motif/descrip.mms +++ b/src/motif/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 August 2006 * +# Date : 19 September 2006 * # * #***************************************************************************** .first @@ -50,6 +50,7 @@ OBJECTS = \ font.obj,\ frame.obj,\ gauge.obj,\ + gdiobj.obj,\ gsockmot.obj,\ icon.obj,\ listbox.obj,\ @@ -102,6 +103,7 @@ SOURCES = \ font.cpp,\ frame.cpp,\ gauge.cpp,\ + gdiobj.cpp,\ gsockmot.cpp,\ icon.cpp,\ listbox.cpp,\ @@ -163,6 +165,7 @@ filedlg.obj : filedlg.cpp font.obj : font.cpp frame.obj : frame.cpp gauge.obj : gauge.cpp +gdiobj.obj : gdiobj.cpp gsockmot.obj : gsockmot.cpp icon.obj : icon.cpp listbox.obj : listbox.cpp diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms index 82a2a262d7..4b64c8072c 100755 --- a/src/xrc/descrip.mms +++ b/src/xrc/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 13 February 2006 * +# Date : 19 September 2006 * # * #***************************************************************************** .first @@ -50,7 +50,10 @@ OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\ xh_scrol.obj,xh_scwin.obj,xh_sizer.obj,xh_slidr.obj,xh_spin.obj,\ xh_split.obj,xh_statbar.obj,xh_stbmp.obj,xh_stbox.obj,xh_stlin.obj,\ xh_sttxt.obj,xh_text.obj,xh_tglbtn.obj,xh_toolb.obj,xh_tree.obj,\ - xh_unkwn.obj,xh_wizrd.obj,xmlres.obj,xmlrsall.obj + xh_unkwn.obj,xh_wizrd.obj,xmlres.obj,xmlrsall.obj,xh_listbk.obj,\ + xh_choicbk.obj,xh_dirpicker.obj,xh_hyperlink.obj,xh_filepicker.obj,\ + xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\ + xh_grid.obj,xh_datectrl.obj,xh_treebk.obj SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\ xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\ @@ -59,7 +62,10 @@ SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\ xh_scrol.cpp,xh_scwin.cpp,xh_sizer.cpp,xh_slidr.cpp,xh_spin.cpp,\ xh_split.cpp,xh_statbar.cpp,xh_stbmp.cpp,xh_stbox.cpp,xh_stlin.cpp,\ xh_sttxt.cpp,xh_text.cpp,xh_tglbtn.cpp,xh_toolb.cpp,xh_tree.cpp,\ - xh_unkwn.cpp,xh_wizrd.cpp,xmlres.cpp,xmlrsall.cpp + xh_unkwn.cpp,xh_wizrd.cpp,xmlres.cpp,xmlrsall.cpp,xh_listbk.cpp,\ + xh_choicbk.cpp,xh_dirpicker.cpp,xh_hyperlink.cpp,xh_filepicker.cpp,\ + xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\ + xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -118,3 +124,15 @@ xh_unkwn.obj : xh_unkwn.cpp xh_wizrd.obj : xh_wizrd.cpp xmlres.obj : xmlres.cpp xmlrsall.obj : xmlrsall.cpp +xh_listbk.obj : xh_listbk.cpp +xh_choicbk.obj : xh_choicbk.cpp +xh_dirpicker.obj : xh_dirpicker.cpp +xh_hyperlink.obj : xh_hyperlink.cpp +xh_filepicker.obj : xh_filepicker.cpp +xh_fontpicker.obj : xh_fontpicker.cpp +xh_clrpicker.obj : xh_clrpicker.cpp +xh_odcombo.obj : xh_odcombo.cpp +xh_mdi.obj : xh_mdi.cpp +xh_grid.obj : xh_grid.cpp +xh_datectrl.obj : xh_datectrl.cpp +xh_treebk.obj : xh_treebk.cpp