Committing in .
Patches to compile on OpenVMS Modified Files: wxWidgets/descrip.mms wxWidgets/src/common/db.cpp wxWidgets/src/common/stream.cpp Added Files: wxWidgets/src/xml/descrip.mms wxWidgets/src/xrc/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
parent
03ed957a32
commit
fa06876d15
@ -34,6 +34,10 @@ gtk : [.include.wx]setup.h
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
|
||||
set default [-.html]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
|
||||
set default [-.xml]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
|
||||
set default [-.xrc]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
|
||||
set default [-.unix]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
|
||||
set default [-.gtk]
|
||||
@ -85,6 +89,10 @@ x11 : [.include.wx]setup.h
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
|
||||
set default [-.html]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
|
||||
set default [-.xml]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
|
||||
set default [-.xrc]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
|
||||
set default [-.unix]
|
||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
|
||||
set default [-.x11]
|
||||
|
||||
@ -1719,8 +1719,12 @@ bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
|
||||
{
|
||||
wxString odbcErrMsg;
|
||||
|
||||
while (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, (long*) &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
|
||||
{
|
||||
#ifdef __VMS
|
||||
while (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, (SQLINTEGER *) &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
|
||||
#else
|
||||
while (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, (long*) &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
|
||||
#endif
|
||||
{
|
||||
odbcErrMsg.Printf(wxT("SQL State = %s\nNative Error Code = %li\nError Message = %s\n"), sqlState, nativeError, errorMsg);
|
||||
logError(odbcErrMsg, sqlState);
|
||||
if (!silent)
|
||||
@ -1746,8 +1750,12 @@ bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
|
||||
/********** wxDb::GetNextError() **********/
|
||||
bool wxDb::GetNextError(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
|
||||
{
|
||||
if (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, (long*) &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
|
||||
return true;
|
||||
#ifdef __VMS
|
||||
if (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, (SQLINTEGER *) &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
|
||||
#else
|
||||
if (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, (long*) &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
|
||||
#endif
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
|
||||
|
||||
@ -576,10 +576,10 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
|
||||
default:
|
||||
wxFAIL_MSG( _T("invalid seek mode") );
|
||||
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
}
|
||||
if (diff < 0 || diff > last_access)
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
SetIntPosition(diff);
|
||||
return diff;
|
||||
}
|
||||
@ -616,7 +616,7 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
|
||||
return ret_off;
|
||||
}
|
||||
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
}
|
||||
|
||||
wxFileOffset wxStreamBuffer::Tell() const
|
||||
@ -628,7 +628,7 @@ wxFileOffset wxStreamBuffer::Tell() const
|
||||
{
|
||||
pos = m_stream->OnSysTell();
|
||||
if ( pos == wxInvalidOffset )
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
}
|
||||
else // no associated stream
|
||||
{
|
||||
@ -659,12 +659,12 @@ wxStreamBase::~wxStreamBase()
|
||||
|
||||
wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
|
||||
{
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
}
|
||||
|
||||
wxFileOffset wxStreamBase::OnSysTell() const
|
||||
{
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -990,7 +990,7 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
|
||||
|
||||
default:
|
||||
wxFAIL_MSG( _T("invalid seek mode") );
|
||||
return wxInvalidOffset;
|
||||
return (wxFileOffset) wxInvalidOffset;
|
||||
}
|
||||
|
||||
if (m_currentPos > m_lastcount)
|
||||
|
||||
58
src/xml/descrip.mms
Executable file
58
src/xml/descrip.mms
Executable file
@ -0,0 +1,58 @@
|
||||
#*****************************************************************************
|
||||
# *
|
||||
# Make file for VMS *
|
||||
# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) *
|
||||
# Date : 20 October 2004 *
|
||||
# *
|
||||
#*****************************************************************************
|
||||
.first
|
||||
define wx [--.include.wx]
|
||||
|
||||
.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__
|
||||
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
|
||||
.else
|
||||
.ifdef __WXX11__
|
||||
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
|
||||
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
|
||||
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
|
||||
/name=(as_is,short)
|
||||
.else
|
||||
CXX_DEFINE =
|
||||
CC_DEFINE =
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.suffixes : .cpp
|
||||
|
||||
.cpp.obj :
|
||||
cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
|
||||
.c.obj :
|
||||
cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
|
||||
|
||||
OBJECTS = xml.obj\
|
||||
|
||||
SOURCES = xml.cpp\
|
||||
|
||||
all : $(SOURCES)
|
||||
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
|
||||
.ifdef __WXMOTIF__
|
||||
library [--.lib]libwx_motif.olb $(OBJECTS)
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
library [--.lib]libwx_gtk.olb $(OBJECTS)
|
||||
.else
|
||||
.ifdef __WXX11__
|
||||
library [--.lib]libwx_x11_univ.olb $(OBJECTS)
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
xml.obj : xml.cpp
|
||||
110
src/xrc/descrip.mms
Executable file
110
src/xrc/descrip.mms
Executable file
@ -0,0 +1,110 @@
|
||||
#*****************************************************************************
|
||||
# *
|
||||
# Make file for VMS *
|
||||
# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) *
|
||||
# Date : 20 October 2004 *
|
||||
# *
|
||||
#*****************************************************************************
|
||||
.first
|
||||
define wx [--.include.wx]
|
||||
|
||||
.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__
|
||||
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
|
||||
.else
|
||||
.ifdef __WXX11__
|
||||
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
|
||||
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
|
||||
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
|
||||
/name=(as_is,short)
|
||||
.else
|
||||
CXX_DEFINE =
|
||||
CC_DEFINE =
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.suffixes : .cpp
|
||||
|
||||
.cpp.obj :
|
||||
cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
|
||||
.c.obj :
|
||||
cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
|
||||
|
||||
OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
|
||||
xh_chckl.obj,xh_choic.obj,xh_combo.obj,xh_dlg.obj,xh_frame.obj,\
|
||||
xh_gauge.obj,xh_gdctl.obj,xh_html.obj,xh_listb.obj,xh_listc.obj,\
|
||||
xh_menu.obj,xh_notbk.obj,xh_panel.obj,xh_radbt.obj,xh_radbx.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
|
||||
|
||||
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,\
|
||||
xh_gauge.cpp,xh_gdctl.cpp,xh_html.cpp,xh_listb.cpp,xh_listc.cpp,\
|
||||
xh_menu.cpp,xh_notbk.cpp,xh_panel.cpp,xh_radbt.cpp,xh_radbx.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
|
||||
|
||||
all : $(SOURCES)
|
||||
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
|
||||
.ifdef __WXMOTIF__
|
||||
library [--.lib]libwx_motif.olb $(OBJECTS)
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
library [--.lib]libwx_gtk.olb $(OBJECTS)
|
||||
.else
|
||||
.ifdef __WXX11__
|
||||
library [--.lib]libwx_x11_univ.olb $(OBJECTS)
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
xh_bmp.obj : xh_bmp.cpp
|
||||
xh_bmpbt.obj : xh_bmpbt.cpp
|
||||
xh_bttn.obj : xh_bttn.cpp
|
||||
xh_cald.obj : xh_cald.cpp
|
||||
xh_chckb.obj : xh_chckb.cpp
|
||||
xh_chckl.obj : xh_chckl.cpp
|
||||
xh_choic.obj : xh_choic.cpp
|
||||
xh_combo.obj : xh_combo.cpp
|
||||
xh_dlg.obj : xh_dlg.cpp
|
||||
xh_frame.obj : xh_frame.cpp
|
||||
xh_gauge.obj : xh_gauge.cpp
|
||||
xh_gdctl.obj : xh_gdctl.cpp
|
||||
xh_html.obj : xh_html.cpp
|
||||
xh_listb.obj : xh_listb.cpp
|
||||
xh_listc.obj : xh_listc.cpp
|
||||
xh_menu.obj : xh_menu.cpp
|
||||
xh_notbk.obj : xh_notbk.cpp
|
||||
xh_panel.obj : xh_panel.cpp
|
||||
xh_radbt.obj : xh_radbt.cpp
|
||||
xh_radbx.obj : xh_radbx.cpp
|
||||
xh_scrol.obj : xh_scrol.cpp
|
||||
xh_scwin.obj : xh_scwin.cpp
|
||||
xh_sizer.obj : xh_sizer.cpp
|
||||
xh_slidr.obj : xh_slidr.cpp
|
||||
xh_spin.obj : xh_spin.cpp
|
||||
xh_split.obj : xh_split.cpp
|
||||
xh_statbar.obj : xh_statbar.cpp
|
||||
xh_stbmp.obj : xh_stbmp.cpp
|
||||
xh_stbox.obj : xh_stbox.cpp
|
||||
xh_stlin.obj : xh_stlin.cpp
|
||||
xh_sttxt.obj : xh_sttxt.cpp
|
||||
xh_text.obj : xh_text.cpp
|
||||
xh_tglbtn.obj : xh_tglbtn.cpp
|
||||
xh_toolb.obj : xh_toolb.cpp
|
||||
xh_tree.obj : xh_tree.cpp
|
||||
xh_unkwn.obj : xh_unkwn.cpp
|
||||
xh_wizrd.obj : xh_wizrd.cpp
|
||||
xmlres.obj : xmlres.cpp
|
||||
xmlrsall.obj : xmlrsall.cpp
|
||||
Loading…
Reference in New Issue
Block a user