From 56b79cb98da2e2e3024fce6f6313546577c34821 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 30 Jan 2000 15:29:45 +0000 Subject: [PATCH] Some but not all compile fixes for typetest (VC++ 1.5); added datetime.cpp to 16-bit compile list; edited isql.h for 16-bit (but not right since doesn't link) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 2 +- include/wx/isql.h | 9 ++++++++- samples/db/dbtest.cpp | 2 +- samples/typetest/typetest.cpp | 26 +++++++++++++------------- src/msw/makefile.dos | 26 +++++++++++++++++++------- 5 files changed, 42 insertions(+), 23 deletions(-) diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 10222b1743..d8073d600c 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -108,7 +108,7 @@ clipcmn.cpp C config.cpp C B ctrlcmn.cpp C ctrlsub.cpp C -datetime.cpp C 32,B +datetime.cpp C B datstrm.cpp C db.cpp C dbtable.cpp C diff --git a/include/wx/isql.h b/include/wx/isql.h index a1f406626d..da29383e6e 100644 --- a/include/wx/isql.h +++ b/include/wx/isql.h @@ -26,7 +26,14 @@ #ifndef _ISQL_H #define _ISQL_H -#ifdef WIN32 +#if defined(__WIN16__) + +#define SQL_API EXPORT CALLBACK +#ifndef EXPORT +#define EXPORT _export +#endif + +#elif defined(WIN32) #define SQL_API __stdcall #else #define FAR diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp index 976585cada..b859661ca3 100644 --- a/samples/db/dbtest.cpp +++ b/samples/db/dbtest.cpp @@ -1432,7 +1432,7 @@ bool CparameterDlg::PutData() bool CparameterDlg::GetData() { wxString tStr; - if (pParamODBCSourceList->GetStringSelection()) + if (pParamODBCSourceList->GetStringSelection() != "") { tStr = pParamODBCSourceList->GetStringSelection(); if (tStr.Length() > (sizeof(wxGetApp().params.ODBCSource)-1)) diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 639e063fdb..3896668435 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -123,7 +123,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" ); ofstream std_file_output( "test_std.dat" ); - wxFileOutputStream file_output( "test_wx.dat" ); + wxFileOutputStream file_output( wxString("test_wx.dat") ); wxBufferedOutputStream buf_output( file_output ); wxTextOutputStream text_output( buf_output ); @@ -186,7 +186,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event)) buf_output.Sync(); - wxFileInputStream file_input( "test_wx.dat" ); + wxFileInputStream file_input( wxString("test_wx.dat") ); wxBufferedInputStream buf_input( file_input ); wxTextInputStream text_input( file_input ); @@ -273,13 +273,13 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream:\n\n" ); - wxFileOutputStream file_output( "test_wx.dat" ); + wxFileOutputStream file_output( wxString("test_wx.dat") ); wxBufferedOutputStream buf_output( file_output ); for (ch = 0; ch < 10; ch++) buf_output.Write( &ch, 1 ); buf_output.Sync(); - wxFileInputStream file_input( "test_wx.dat" ); + wxFileInputStream file_input( wxString("test_wx.dat") ); for (ch2 = 0; ch2 < 10; ch2++) { file_input.Read( &ch, 1 ); @@ -290,7 +290,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream, then\n" ); textCtrl.WriteText( "seeking back to #3 and writing 3:\n\n" ); - wxFileOutputStream file_output2( "test_wx2.dat" ); + wxFileOutputStream file_output2( wxString("test_wx2.dat") ); wxBufferedOutputStream buf_output2( file_output2 ); for (ch = 0; ch < 10; ch++) buf_output2.Write( &ch, 1 ); @@ -299,7 +299,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) buf_output2.Write( &ch, 1 ); buf_output2.Sync(); - wxFileInputStream file_input2( "test_wx2.dat" ); + wxFileInputStream file_input2( wxString("test_wx2.dat") ); for (ch2 = 0; ch2 < 10; ch2++) { file_input2.Read( &ch, 1 ); @@ -317,7 +317,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Reading number 0 to 9 from buffered wxFileInputStream, then\n" ); textCtrl.WriteText( "seeking back to #3 and reading 3:\n\n" ); - wxFileInputStream file_input3( "test_wx2.dat" ); + wxFileInputStream file_input3( wxString("test_wx2.dat") ); wxBufferedInputStream buf_input3( file_input3 ); for (ch2 = 0; ch2 < 10; ch2++) { @@ -345,7 +345,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream:\n\n" ); - wxFileOutputStream file_output( "test_wx.dat" ); + wxFileOutputStream file_output( wxString("test_wx.dat") ); for (ch = 0; ch < 10; ch++) file_output.Write( &ch, 1 ); @@ -353,7 +353,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Reading 0 to 10 to wxFileInputStream:\n\n" ); - wxFileInputStream file_input( "test_wx.dat" ); + wxFileInputStream file_input( wxString("test_wx.dat") ); for (ch2 = 0; ch2 < 11; ch2++) { file_input.Read( &ch, 1 ); @@ -402,7 +402,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Reading 0 to 10 to wxFFileInputStream:\n\n" ); - wxFFileInputStream ffile_input( "test_wx.dat" ); + wxFFileInputStream ffile_input( wxString("test_wx.dat") ); for (ch2 = 0; ch2 < 11; ch2++) { ffile_input.Read( &ch, 1 ); @@ -450,7 +450,7 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Reading 0 to 10 to buffered wxFFileInputStream:\n\n" ); - wxFFileInputStream ffile_input2( "test_wx.dat" ); + wxFFileInputStream ffile_input2( wxString("test_wx.dat") ); wxBufferedInputStream buf_input( ffile_input2 ); for (ch2 = 0; ch2 < 11; ch2++) { @@ -507,7 +507,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event)) // bigger than buffer textCtrl.WriteText( "Writing 2000x 1 to wxFileOutputStream.\n\n" ); - wxFileOutputStream file_output( "test_wx.dat" ); + wxFileOutputStream file_output( wxString("test_wx.dat") ); for (int i = 0; i < 2000; i++) { char ch = 1; @@ -516,7 +516,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "Opening with a buffered wxFileInputStream:\n\n" ); - wxFileInputStream file_input( "test_wx.dat" ); + wxFileInputStream file_input( wxString("test_wx.dat") ); wxBufferedInputStream buf_input( file_input ); textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 98c73f44d2..211a92e054 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:31, 2000/01/19 +# This file was automatically generated by tmake at 14:35, 2000/01/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -97,11 +97,13 @@ COMMONOBJS1 = \ $(COMMDIR)\config.obj \ $(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlsub.obj \ + $(COMMDIR)\datetime.obj \ $(COMMDIR)\datstrm.obj \ $(COMMDIR)\db.obj \ $(COMMDIR)\dbtable.obj \ $(COMMDIR)\dcbase.obj \ $(COMMDIR)\dlgcmn.obj \ + $(COMMDIR)\dndcmn.obj \ $(COMMDIR)\dobjcmn.obj \ $(COMMDIR)\docmdi.obj \ $(COMMDIR)\docview.obj \ @@ -121,6 +123,7 @@ COMMONOBJS1 = \ $(COMMDIR)\fs_inet.obj \ $(COMMDIR)\fs_zip.obj \ $(COMMDIR)\gdicmn.obj \ + $(COMMDIR)\geometry.obj \ $(COMMDIR)\gifdecod.obj \ $(COMMDIR)\hash.obj \ $(COMMDIR)\helpbase.obj \ @@ -222,7 +225,6 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \ $(MSWDIR)\menu.obj \ $(MSWDIR)\menuitem.obj \ $(MSWDIR)\metafile.obj \ - $(MSWDIR)\mimetype.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ @@ -580,11 +582,6 @@ $(MSWDIR)/metafile.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(MSWDIR)/mimetype.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(MSWDIR)/minifram.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -775,6 +772,11 @@ $(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/datetime.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/datstrm.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -800,6 +802,11 @@ $(COMMDIR)/dlgcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/dndcmn.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/dobjcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -895,6 +902,11 @@ $(COMMDIR)/gdicmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/geometry.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/gifdecod.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -- 2.47.2