From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 6 Feb 2000 21:25:27 +0000 (+0000)
Subject: Small changes for VC++ 4 compilation
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/69d16e3ef87c21364456307b5df88c2f4962b63d

Small changes for VC++ 4 compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index cfd3dd802b..ecd17efbe5 100644
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -177,7 +177,7 @@ public:
 };
 
 // the type of dialup event handler function
-typedef void (wxObject::*wxDialUpEventFunction)(wxDialUpEvent&);
+typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 
 // macros to catch dialup events
 #define EVT_DIALUP_CONNECTED(func) { wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL},
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 05db69ab34..999eccf234 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -102,8 +102,10 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\nativdlg
         nmake -f makefile.vc FINAL=$(FINAL)
+!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\dialup
         nmake -f makefile.vc FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\notebook
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\oleauto
@@ -134,8 +136,10 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\splitter
         nmake -f makefile.vc FINAL=$(FINAL)
+!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab
         nmake -f makefile.vc FINAL=$(FINAL)
+!endif
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\text
diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 05e9da16ad..b4021b93ae 100644
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -211,10 +211,12 @@ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 		wxMessageBox("Could not set active cell value.");
 		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.");
 		return;
 	}
+#endif
 }
 
diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 7ba1dd698f..2240786c19 100644
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -556,7 +556,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   wxYield();
 
   // Get the data
-  wxFileOutputStream sout("test.url");
+  wxFileOutputStream sout(wxString("test.url"));
   data->Read(sout);
   m_text->AppendText(_("Results written to file: test.url\n"));
   m_text->AppendText(_("Done.\n"));
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 3896668435..fd0c99b1e9 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -178,9 +178,12 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
     tmp.Printf( _T("Float: %f\n"), f );
     textCtrl.WriteText( tmp );
 
+    // This doesn't compile (at least with VC++ 4)
+#if 0
     std_file_input >> str;
     tmp.Printf( _T("String: %s\n"), str.c_str() );
     textCtrl.WriteText( tmp );
+#endif
 
     textCtrl.WriteText( "\nReading from wxFileInputStream:\n" );