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

Some but not all compile fixes for typetest (VC++ 1.5); added datetime.cpp

Browse Source 
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
This commit is contained in:
Julian Smart
2000-01-30 15:29:45 +00:00
parent f6081a0462
commit 56b79cb98d
5 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/tmake/filelist.txt
View File

@@ -108,7 +108,7 @@ clipcmn.cpp C
config.cpp C B config.cpp C B
ctrlcmn.cpp C ctrlcmn.cpp C
ctrlsub.cpp C ctrlsub.cpp C
datetime.cpp C 32,B datetime.cpp C B
datstrm.cpp C datstrm.cpp C
db.cpp C db.cpp C
dbtable.cpp C dbtable.cpp C

9
include/wx/isql.h
View File

@@ -26,7 +26,14 @@
#ifndef _ISQL_H #ifndef _ISQL_H
#define _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 #define SQL_API __stdcall
#else #else
#define FAR #define FAR

2
samples/db/dbtest.cpp
View File

@@ -1432,7 +1432,7 @@ bool CparameterDlg::PutData()
bool CparameterDlg::GetData() bool CparameterDlg::GetData()
{ {
wxString tStr; wxString tStr;
if (pParamODBCSourceList->GetStringSelection()) if (pParamODBCSourceList->GetStringSelection() != "")
{ {
tStr = pParamODBCSourceList->GetStringSelection(); tStr = pParamODBCSourceList->GetStringSelection();
if (tStr.Length() > (sizeof(wxGetApp().params.ODBCSource)-1)) if (tStr.Length() > (sizeof(wxGetApp().params.ODBCSource)-1))

26
samples/typetest/typetest.cpp
View File

@@ -123,7 +123,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" ); textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" );
ofstream std_file_output( "test_std.dat" ); 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 ); wxBufferedOutputStream buf_output( file_output );
wxTextOutputStream text_output( buf_output ); wxTextOutputStream text_output( buf_output );
@@ -186,7 +186,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
buf_output.Sync(); buf_output.Sync();
wxFileInputStream file_input( "test_wx.dat" ); wxFileInputStream file_input( wxString("test_wx.dat") );
wxBufferedInputStream buf_input( file_input ); wxBufferedInputStream buf_input( file_input );
wxTextInputStream text_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" ); 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 ); wxBufferedOutputStream buf_output( file_output );
for (ch = 0; ch < 10; ch++) for (ch = 0; ch < 10; ch++)
buf_output.Write( &ch, 1 ); buf_output.Write( &ch, 1 );
buf_output.Sync(); buf_output.Sync();
wxFileInputStream file_input( "test_wx.dat" ); wxFileInputStream file_input( wxString("test_wx.dat") );
for (ch2 = 0; ch2 < 10; ch2++) for (ch2 = 0; ch2 < 10; ch2++)
{ {
file_input.Read( &ch, 1 ); 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( "Writing number 0 to 9 to buffered wxFileOutputStream, then\n" );
textCtrl.WriteText( "seeking back to #3 and writing 3:\n\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 ); wxBufferedOutputStream buf_output2( file_output2 );
for (ch = 0; ch < 10; ch++) for (ch = 0; ch < 10; ch++)
buf_output2.Write( &ch, 1 ); buf_output2.Write( &ch, 1 );
@@ -299,7 +299,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event))
buf_output2.Write( &ch, 1 ); buf_output2.Write( &ch, 1 );
buf_output2.Sync(); buf_output2.Sync();
wxFileInputStream file_input2( "test_wx2.dat" ); wxFileInputStream file_input2( wxString("test_wx2.dat") );
for (ch2 = 0; ch2 < 10; ch2++) for (ch2 = 0; ch2 < 10; ch2++)
{ {
file_input2.Read( &ch, 1 ); 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( "Reading number 0 to 9 from buffered wxFileInputStream, then\n" );
textCtrl.WriteText( "seeking back to #3 and reading 3:\n\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 ); wxBufferedInputStream buf_input3( file_input3 );
for (ch2 = 0; ch2 < 10; ch2++) 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" ); 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++) for (ch = 0; ch < 10; ch++)
file_output.Write( &ch, 1 ); 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" ); 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++) for (ch2 = 0; ch2 < 11; ch2++)
{ {
file_input.Read( &ch, 1 ); 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" ); 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++) for (ch2 = 0; ch2 < 11; ch2++)
{ {
ffile_input.Read( &ch, 1 ); 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" ); 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 ); wxBufferedInputStream buf_input( ffile_input2 );
for (ch2 = 0; ch2 < 11; ch2++) for (ch2 = 0; ch2 < 11; ch2++)
{ {
@@ -507,7 +507,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
// bigger than buffer // bigger than buffer
textCtrl.WriteText( "Writing 2000x 1 to wxFileOutputStream.\n\n" ); 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++) for (int i = 0; i < 2000; i++)
{ {
char ch = 1; char ch = 1;
@@ -516,7 +516,7 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
textCtrl.WriteText( "Opening with a buffered wxFileInputStream:\n\n" ); 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 ); wxBufferedInputStream buf_input( file_input );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " ); textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );

26
src/msw/makefile.dos
View File

@@ -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! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
# #
@@ -97,11 +97,13 @@ COMMONOBJS1 = \
$(COMMDIR)\config.obj \ $(COMMDIR)\config.obj \
$(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlcmn.obj \
$(COMMDIR)\ctrlsub.obj \ $(COMMDIR)\ctrlsub.obj \
$(COMMDIR)\datetime.obj \
$(COMMDIR)\datstrm.obj \ $(COMMDIR)\datstrm.obj \
$(COMMDIR)\db.obj \ $(COMMDIR)\db.obj \
$(COMMDIR)\dbtable.obj \ $(COMMDIR)\dbtable.obj \
$(COMMDIR)\dcbase.obj \ $(COMMDIR)\dcbase.obj \
$(COMMDIR)\dlgcmn.obj \ $(COMMDIR)\dlgcmn.obj \
$(COMMDIR)\dndcmn.obj \
$(COMMDIR)\dobjcmn.obj \ $(COMMDIR)\dobjcmn.obj \
$(COMMDIR)\docmdi.obj \ $(COMMDIR)\docmdi.obj \
$(COMMDIR)\docview.obj \ $(COMMDIR)\docview.obj \
@@ -121,6 +123,7 @@ COMMONOBJS1 = \
$(COMMDIR)\fs_inet.obj \ $(COMMDIR)\fs_inet.obj \
$(COMMDIR)\fs_zip.obj \ $(COMMDIR)\fs_zip.obj \
$(COMMDIR)\gdicmn.obj \ $(COMMDIR)\gdicmn.obj \
$(COMMDIR)\geometry.obj \
$(COMMDIR)\gifdecod.obj \ $(COMMDIR)\gifdecod.obj \
$(COMMDIR)\hash.obj \ $(COMMDIR)\hash.obj \
$(COMMDIR)\helpbase.obj \ $(COMMDIR)\helpbase.obj \
@@ -222,7 +225,6 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
$(MSWDIR)\menu.obj \ $(MSWDIR)\menu.obj \
$(MSWDIR)\menuitem.obj \ $(MSWDIR)\menuitem.obj \
$(MSWDIR)\metafile.obj \ $(MSWDIR)\metafile.obj \
$(MSWDIR)\mimetype.obj \
$(MSWDIR)\minifram.obj \ $(MSWDIR)\minifram.obj \
$(MSWDIR)\msgdlg.obj \ $(MSWDIR)\msgdlg.obj \
$(MSWDIR)\nativdlg.obj \ $(MSWDIR)\nativdlg.obj \
@@ -580,11 +582,6 @@ $(MSWDIR)/metafile.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(MSWDIR)/mimetype.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(MSWDIR)/minifram.obj: $*.$(SRCSUFF) $(MSWDIR)/minifram.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -775,6 +772,11 @@ $(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/datetime.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/datstrm.obj: $*.$(SRCSUFF) $(COMMDIR)/datstrm.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -800,6 +802,11 @@ $(COMMDIR)/dlgcmn.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/dndcmn.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/dobjcmn.obj: $*.$(SRCSUFF) $(COMMDIR)/dobjcmn.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -895,6 +902,11 @@ $(COMMDIR)/gdicmn.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/geometry.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/gifdecod.obj: $*.$(SRCSUFF) $(COMMDIR)/gifdecod.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)