From abfcca57dd0d805ceec9e19c4be207614d79252a Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Wed, 7 Nov 2001 09:26:33 +0000 Subject: [PATCH 1/1] 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 --- descrip.mms | 8 ++++++ distrib/msw/makefile.rsp | 4 +++ include/wx/dbgrid.h | 2 +- lib/vms_gtk.opt | 1 + samples/db/dbtest.cpp | 6 +++++ samples/dialup/descrip.mms | 47 +++++++++++++++++++++++++++++++++++ samples/docview/descrip.mms | 49 +++++++++++++++++++++++++++++++++++++ samples/font/descrip.mms | 47 +++++++++++++++++++++++++++++++++++ setup.h_vms | 6 +++-- src/common/descrip.mms | 6 +++++ src/generic/descrip.mms | 6 +++++ 11 files changed, 179 insertions(+), 3 deletions(-) create mode 100644 samples/dialup/descrip.mms create mode 100644 samples/docview/descrip.mms create mode 100644 samples/font/descrip.mms diff --git a/descrip.mms b/descrip.mms index 4607daa1eb..2a0b98a4b0 100644 --- a/descrip.mms +++ b/descrip.mms @@ -44,12 +44,20 @@ gtk : [.include.wx]setup.h $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.controls] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.db] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.dialogs] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.dialup] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.dnd] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.docview] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.drawing] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) + set default [-.font] + $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.image] $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [-.mdi] diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index 3e5a5ad1b7..454b31aee1 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -136,9 +136,13 @@ samples/caret/descrip.mms samples/checklst/descrip.mms samples/config/descrip.mms samples/controls/descrip.mms +samples/db/descrip.mms samples/dialogs/descrip.mms +samples/dialup/descrip.mms samples/dnd/descrip.mms +samples/docview/descrip.mms samples/drawing/descrip.mms +samples/font/descrip.mms samples/image/descrip.mms samples/mdi/descrip.mms samples/menu/descrip.mms diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index a55ccfdcad..066186665b 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -136,7 +136,7 @@ public: virtual void SetValueAsCustom(int row, int col, const wxString& typeName, void* value); - virtual wxString wxDbGridTableBase::GetColLabelValue(int col); + virtual wxString GetColLabelValue(int col); virtual bool AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE); virtual void ValidateRow(int row); diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt index 76c59ed611..3c04329b16 100644 --- a/lib/vms_gtk.opt +++ b/lib/vms_gtk.opt @@ -5,6 +5,7 @@ sys$library:libpng.olb/lib sys$library:libz.olb/lib sys$library:tiff.olb/lib X11:libxpm.olb/lib +sys$share:iodbc.exe/share sys$share:libgtk.exe/share sys$share:libgdk.exe/share sys$share:libglib.exe/share diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp index 4c8037a85d..ac9bc0c18e 100644 --- a/samples/db/dbtest.cpp +++ b/samples/db/dbtest.cpp @@ -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; diff --git a/samples/dialup/descrip.mms b/samples/dialup/descrip.mms new file mode 100644 index 0000000000..b0fbd42486 --- /dev/null +++ b/samples/dialup/descrip.mms @@ -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 diff --git a/samples/docview/descrip.mms b/samples/docview/descrip.mms new file mode 100644 index 0000000000..fb93fd2c2a --- /dev/null +++ b/samples/docview/descrip.mms @@ -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 diff --git a/samples/font/descrip.mms b/samples/font/descrip.mms new file mode 100644 index 0000000000..da7ff915b1 --- /dev/null +++ b/samples/font/descrip.mms @@ -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 diff --git a/setup.h_vms b/setup.h_vms index 602cd4946d..bc981e106d 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -106,7 +106,9 @@ #endif #undef __WIN95__ +#ifndef __WIN32__ #undef __WIN32__ +#endif #undef __GNUWIN32__ #undef STRICT #undef WINVER @@ -152,13 +154,13 @@ /* * Use iODBC */ -#define wxUSE_ODBC 0 +#define wxUSE_ODBC 1 #define wxODBC_FWD_ONLY_CURSORS 1 #define wxODBC_BACKWARD_COMPATABILITY 0 /* * Use freetype */ -#define wxUSE_FREETYPE 0 +#define wxUSE_FREETYPE 1 /* * Use Threads */ diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 80b609c340..d7a7cd9a1c 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -44,6 +44,7 @@ OBJECTS = \ clipcmn.obj,\ clntdata.obj,\ cmdline.obj,\ + cmdproc.obj,\ cmndata.obj,\ config.obj,\ containr.obj,\ @@ -53,6 +54,7 @@ OBJECTS = \ datetime.obj,\ datstrm.obj,\ db.obj,\ + dbgrid.obj,\ dbtable.obj,\ dcbase.obj,\ dlgcmn.obj,\ @@ -156,6 +158,7 @@ SOURCES = \ clipcmn.cpp,\ clntdata.cpp,\ cmdline.cpp,\ + cmdproc.cpp,\ cmndata.cpp,\ config.cpp,\ containr.cpp,\ @@ -165,6 +168,7 @@ SOURCES = \ datetime.cpp,\ datstrm.cpp,\ db.cpp,\ + dbgrid.cpp,\ dbtable.cpp,\ dcbase.cpp,\ dlgcmn.cpp,\ @@ -299,6 +303,7 @@ choiccmn.obj : choiccmn.cpp clipcmn.obj : clipcmn.cpp clntdata.obj : clntdata.cpp cmdline.obj : cmdline.cpp +cmdproc.obj : cmdproc.cpp cmndata.obj : cmndata.cpp config.obj : config.cpp containr.obj : containr.cpp @@ -308,6 +313,7 @@ ctrlsub.obj : ctrlsub.cpp datetime.obj : datetime.cpp datstrm.obj : datstrm.cpp db.obj : db.cpp +dbgrid.obj : dbgrid.cpp dbtable.obj : dbtable.cpp dcbase.obj : dcbase.cpp dlgcmn.obj : dlgcmn.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 7207131da3..669c314783 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -42,6 +42,8 @@ OBJECTS = \ dirdlgg.obj,\ fontdlgg.obj,\ grid.obj,\ + gridctrl.obj,\ + gridsel.obj,\ helpext.obj,\ helphtml.obj,\ helpwxht.obj,\ @@ -83,6 +85,8 @@ SOURCES = \ filedlgg.cpp,\ fontdlgg.cpp,\ grid.cpp,\ + gridctrl.cpp,\ + gridsel.cpp,\ helpext.cpp,\ helphtml.cpp,\ helpwxht.cpp,\ @@ -143,6 +147,8 @@ dirdlgg.obj : dirdlgg.cpp filedlgg.obj : filedlgg.cpp fontdlgg.obj : fontdlgg.cpp grid.obj : grid.cpp +gridctrl.obj : gridctrl.cpp +gridsel.obj : gridsel.cpp helpext.obj : helpext.cpp helphtml.obj : helphtml.cpp helpwxht.obj : helpwxht.cpp -- 2.47.2