AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small changes for VC++ 4 compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-02-06 21:25:27 +00:00
parent 95bf655c50
commit 69d16e3ef8
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dialup.h
View File

@ -177,7 +177,7 @@ public:
}; };
// the type of dialup event handler function // the type of dialup event handler function
typedef void (wxObject::*wxDialUpEventFunction)(wxDialUpEvent&); typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
// macros to catch dialup events // macros to catch dialup events
#define EVT_DIALUP_CONNECTED(func) { wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL}, #define EVT_DIALUP_CONNECTED(func) { wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL},

4
samples/makefile.vc
View File

@ -102,8 +102,10 @@ all:
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\dialup cd $(WXDIR)\samples\dialup
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\notebook cd $(WXDIR)\samples\notebook
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\oleauto cd $(WXDIR)\samples\oleauto
@ -134,8 +136,10 @@ all:
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\splitter
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\tab cd $(WXDIR)\samples\tab
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\taskbar cd $(WXDIR)\samples\taskbar
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\text cd $(WXDIR)\samples\text

4
samples/oleauto/oleauto.cpp
View File

@ -211,10 +211,12 @@ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
wxMessageBox("Could not set active cell value."); wxMessageBox("Could not set active cell value.");
return; return;
} }
if (!excelObject.PutProperty("ActiveCell.Font.Bold", (bool) TRUE)) #ifdef HAVE_BOOL
if (!excelObject.PutProperty("ActiveCell.Font.Bold", wxVariant((bool) TRUE)) )
{ {
wxMessageBox("Could not put Bold property to active cell."); wxMessageBox("Could not put Bold property to active cell.");
return; return;
} }
#endif
} }

2
samples/sockets/client.cpp
View File

@ -556,7 +556,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
wxYield(); wxYield();
// Get the data // Get the data
wxFileOutputStream sout("test.url"); wxFileOutputStream sout(wxString("test.url"));
data->Read(sout); data->Read(sout);
m_text->AppendText(_("Results written to file: test.url\n")); m_text->AppendText(_("Results written to file: test.url\n"));
m_text->AppendText(_("Done.\n")); m_text->AppendText(_("Done.\n"));

3
samples/typetest/typetest.cpp
View File

@ -178,9 +178,12 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
tmp.Printf( _T("Float: %f\n"), f ); tmp.Printf( _T("Float: %f\n"), f );
textCtrl.WriteText( tmp ); textCtrl.WriteText( tmp );
// This doesn't compile (at least with VC++ 4)
#if 0
std_file_input >> str; std_file_input >> str;
tmp.Printf( _T("String: %s\n"), str.c_str() ); tmp.Printf( _T("String: %s\n"), str.c_str() );
textCtrl.WriteText( tmp ); textCtrl.WriteText( tmp );
#endif
textCtrl.WriteText( "\nReading from wxFileInputStream:\n" ); textCtrl.WriteText( "\nReading from wxFileInputStream:\n" );