Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing in .

Browse Source 
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:
Jouk Jansen
2001-11-07 09:26:33 +00:00
parent 1d93af2fbf
commit abfcca57dd
11 changed files with 179 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
descrip.mms
View File

@@ -44,12 +44,20 @@ gtk : [.include.wx]setup.h
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.controls] set default [-.controls]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.db]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.dialogs] set default [-.dialogs]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.dialup]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.dnd] set default [-.dnd]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.docview]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.drawing] set default [-.drawing]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.font]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.image] set default [-.image]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.mdi] set default [-.mdi]

4
distrib/msw/makefile.rsp
View File

@@ -136,9 +136,13 @@ samples/caret/descrip.mms
samples/checklst/descrip.mms samples/checklst/descrip.mms
samples/config/descrip.mms samples/config/descrip.mms
samples/controls/descrip.mms samples/controls/descrip.mms
samples/db/descrip.mms
samples/dialogs/descrip.mms samples/dialogs/descrip.mms
samples/dialup/descrip.mms
samples/dnd/descrip.mms samples/dnd/descrip.mms
samples/docview/descrip.mms
samples/drawing/descrip.mms samples/drawing/descrip.mms
samples/font/descrip.mms
samples/image/descrip.mms samples/image/descrip.mms
samples/mdi/descrip.mms samples/mdi/descrip.mms
samples/menu/descrip.mms samples/menu/descrip.mms

2
include/wx/dbgrid.h
View File

@@ -136,7 +136,7 @@ public:
virtual void SetValueAsCustom(int row, int col, const wxString& typeName, void* value); 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 bool AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE);
virtual void ValidateRow(int row); virtual void ValidateRow(int row);

1
lib/vms_gtk.opt
View File

@@ -5,6 +5,7 @@ sys$library:libpng.olb/lib
sys$library:libz.olb/lib sys$library:libz.olb/lib
sys$library:tiff.olb/lib sys$library:tiff.olb/lib
X11:libxpm.olb/lib X11:libxpm.olb/lib
sys$share:iodbc.exe/share
sys$share:libgtk.exe/share sys$share:libgtk.exe/share
sys$share:libgdk.exe/share sys$share:libgdk.exe/share
sys$share:libglib.exe/share sys$share:libglib.exe/share

6
samples/db/dbtest.cpp
View File

@@ -2651,6 +2651,9 @@ void DisplayDbDiagnostics(wxDb *pDb)
} }
s += "\n"; s += "\n";
#ifdef __VMS__
#pragma message disable incboodep
#endif
comma = FALSE; comma = FALSE;
s += langDBINF_TXN_ISOLATION_OPTS; s += langDBINF_TXN_ISOLATION_OPTS;
if (pDb->dbInf.txnIsolationOptions & SQL_TXN_READ_UNCOMMITTED) if (pDb->dbInf.txnIsolationOptions & SQL_TXN_READ_UNCOMMITTED)
@@ -2758,6 +2761,9 @@ void DisplayDbDiagnostics(wxDb *pDb)
if (pDb->dbInf.staticSensitivity & SQL_SS_UPDATES) if (pDb->dbInf.staticSensitivity & SQL_SS_UPDATES)
{if (comma++) s += ", "; s += langDBINF_UPDATES;} {if (comma++) s += ", "; s += langDBINF_UPDATES;}
s += "\n"; s += "\n";
#ifdef __VMS__
#pragma message enable incboodep
#endif
s += langDBINF_TXN_CAPABLE; s += langDBINF_TXN_CAPABLE;

47
samples/dialup/descrip.mms Normal file
View 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
View 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
View 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

6
setup.h_vms
View File

@@ -106,7 +106,9 @@
#endif #endif
#undef __WIN95__ #undef __WIN95__
#ifndef __WIN32__
#undef __WIN32__ #undef __WIN32__
#endif
#undef __GNUWIN32__ #undef __GNUWIN32__
#undef STRICT #undef STRICT
#undef WINVER #undef WINVER
@@ -152,13 +154,13 @@
/* /*
* Use iODBC * Use iODBC
*/ */
#define wxUSE_ODBC 0 #define wxUSE_ODBC 1
#define wxODBC_FWD_ONLY_CURSORS 1 #define wxODBC_FWD_ONLY_CURSORS 1
#define wxODBC_BACKWARD_COMPATABILITY 0 #define wxODBC_BACKWARD_COMPATABILITY 0
/* /*
* Use freetype * Use freetype
*/ */
#define wxUSE_FREETYPE 0 #define wxUSE_FREETYPE 1
/* /*
* Use Threads * Use Threads
*/ */

6
src/common/descrip.mms
View File

@@ -44,6 +44,7 @@ OBJECTS = \
clipcmn.obj,\ clipcmn.obj,\
clntdata.obj,\ clntdata.obj,\
cmdline.obj,\ cmdline.obj,\
cmdproc.obj,\
cmndata.obj,\ cmndata.obj,\
config.obj,\ config.obj,\
containr.obj,\ containr.obj,\
@@ -53,6 +54,7 @@ OBJECTS = \
datetime.obj,\ datetime.obj,\
datstrm.obj,\ datstrm.obj,\
db.obj,\ db.obj,\
dbgrid.obj,\
dbtable.obj,\ dbtable.obj,\
dcbase.obj,\ dcbase.obj,\
dlgcmn.obj,\ dlgcmn.obj,\
@@ -156,6 +158,7 @@ SOURCES = \
clipcmn.cpp,\ clipcmn.cpp,\
clntdata.cpp,\ clntdata.cpp,\
cmdline.cpp,\ cmdline.cpp,\
cmdproc.cpp,\
cmndata.cpp,\ cmndata.cpp,\
config.cpp,\ config.cpp,\
containr.cpp,\ containr.cpp,\
@@ -165,6 +168,7 @@ SOURCES = \
datetime.cpp,\ datetime.cpp,\
datstrm.cpp,\ datstrm.cpp,\
db.cpp,\ db.cpp,\
dbgrid.cpp,\
dbtable.cpp,\ dbtable.cpp,\
dcbase.cpp,\ dcbase.cpp,\
dlgcmn.cpp,\ dlgcmn.cpp,\
@@ -299,6 +303,7 @@ choiccmn.obj : choiccmn.cpp
clipcmn.obj : clipcmn.cpp clipcmn.obj : clipcmn.cpp
clntdata.obj : clntdata.cpp clntdata.obj : clntdata.cpp
cmdline.obj : cmdline.cpp cmdline.obj : cmdline.cpp
cmdproc.obj : cmdproc.cpp
cmndata.obj : cmndata.cpp cmndata.obj : cmndata.cpp
config.obj : config.cpp config.obj : config.cpp
containr.obj : containr.cpp containr.obj : containr.cpp
@@ -308,6 +313,7 @@ ctrlsub.obj : ctrlsub.cpp
datetime.obj : datetime.cpp datetime.obj : datetime.cpp
datstrm.obj : datstrm.cpp datstrm.obj : datstrm.cpp
db.obj : db.cpp db.obj : db.cpp
dbgrid.obj : dbgrid.cpp
dbtable.obj : dbtable.cpp dbtable.obj : dbtable.cpp
dcbase.obj : dcbase.cpp dcbase.obj : dcbase.cpp
dlgcmn.obj : dlgcmn.cpp dlgcmn.obj : dlgcmn.cpp

6
src/generic/descrip.mms
View File

@@ -42,6 +42,8 @@ OBJECTS = \
dirdlgg.obj,\ dirdlgg.obj,\
fontdlgg.obj,\ fontdlgg.obj,\
grid.obj,\ grid.obj,\
gridctrl.obj,\
gridsel.obj,\
helpext.obj,\ helpext.obj,\
helphtml.obj,\ helphtml.obj,\
helpwxht.obj,\ helpwxht.obj,\
@@ -83,6 +85,8 @@ SOURCES = \
filedlgg.cpp,\ filedlgg.cpp,\
fontdlgg.cpp,\ fontdlgg.cpp,\
grid.cpp,\ grid.cpp,\
gridctrl.cpp,\
gridsel.cpp,\
helpext.cpp,\ helpext.cpp,\
helphtml.cpp,\ helphtml.cpp,\
helpwxht.cpp,\ helpwxht.cpp,\
@@ -143,6 +147,8 @@ dirdlgg.obj : dirdlgg.cpp
filedlgg.obj : filedlgg.cpp filedlgg.obj : filedlgg.cpp
fontdlgg.obj : fontdlgg.cpp fontdlgg.obj : fontdlgg.cpp
grid.obj : grid.cpp grid.obj : grid.cpp
gridctrl.obj : gridctrl.cpp
gridsel.obj : gridsel.cpp
helpext.obj : helpext.cpp helpext.obj : helpext.cpp
helphtml.obj : helphtml.cpp helphtml.obj : helphtml.cpp
helpwxht.obj : helpwxht.cpp helpwxht.obj : helpwxht.cpp