From 2996bcde9c1b96e2b8659a6eaf7201b56085abbb Mon Sep 17 00:00:00 2001
From: Patrick Albert <als@barjov.frmug.fr.net>
Date: Tue, 24 Aug 1999 15:54:04 +0000
Subject: [PATCH] Minor corrections to be able to compile with VC++ 1.5C and
 VC++ 4.1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/busyinfo.cpp |  3 ++-
 src/generic/prop.cpp     |  2 +-
 src/makemsc.env          |  3 ++-
 src/msw/makefile.dos     | 21 +++++++++++++--------
 src/msw/spinbutt.cpp     |  2 ++
 src/msw/treectrl.cpp     |  2 ++
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index d446750d64..0b94f12ab5 100644
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -51,4 +51,5 @@ wxBusyInfo::~wxBusyInfo()
 }
 
 #endif
-  // wxUSE_BUSYINFO
\ No newline at end of file
+  // wxUSE_BUSYINFO
+
diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 178d82bc97..537588ba18 100644
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -370,7 +370,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     {
       wxChar** s = copyFrom.StringValuePtr();
       // what is this? are you trying to assign a bool or a string?  VA can't figure it out..
-#if defined(__VISAGECPP__)
+#if defined(__VISAGECPP__) || defined( __VISUALC__ )
       (*this) = s;
 #else
       (*this) = s != 0;
diff --git a/src/makemsc.env b/src/makemsc.env
index f21ae55fec..282fafea22 100644
--- a/src/makemsc.env
+++ b/src/makemsc.env
@@ -26,7 +26,8 @@ WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
 OBJSUFF=obj
 SRCSUFF=cpp
 
-INC=/I$(WXDIR)\include
+#INC=/I$(WXDIR)\include
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)
 
 # Set this to nothing if using MS C++ 7
 ZOPTION=/Z7
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index d390c878d4..137a57c87a 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -101,7 +101,6 @@ COMMONOBJS = \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
 		$(COMMDIR)\event.obj \
-		$(COMMDIR)\extended.obj \
 		$(COMMDIR)\ffile.obj \
 		$(COMMDIR)\file.obj \
 		$(COMMDIR)\fileconf.obj \
@@ -118,7 +117,6 @@ COMMONOBJS = \
 		$(COMMDIR)\image.obj \
 		$(COMMDIR)\imaggif.obj \
 		$(COMMDIR)\imagjpeg.obj \
-		$(COMMDIR)\imagpng.obj \
 		$(COMMDIR)\imagpnm.obj \
 		$(COMMDIR)\intl.obj \
 		$(COMMDIR)\ipcbase.obj \
@@ -146,7 +144,6 @@ COMMONOBJS = \
 		$(COMMDIR)\timercmn.obj \
 		$(COMMDIR)\tokenzr.obj \
 		$(COMMDIR)\txtstrm.obj \
-		$(COMMDIR)\unzip.obj \
 		$(COMMDIR)\utilscmn.obj \
 		$(COMMDIR)\valgen.obj \
 		$(COMMDIR)\validate.obj \
@@ -157,8 +154,14 @@ COMMONOBJS = \
 		$(COMMDIR)\wxchar.obj \
 		$(COMMDIR)\wxexpr.obj \
 		$(COMMDIR)\zipstrm.obj \
+		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\unzip.obj \
 		$(COMMDIR)\zstream.obj
 
+# Won't compile
+#		$(COMMDIR)\imagpng.obj \
+#
+
 MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\app.obj \
 		$(MSWDIR)\bitmap.obj \
@@ -210,7 +213,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\palette.obj \
 		$(MSWDIR)\pen.obj \
 		$(MSWDIR)\penwin.obj \
-		$(MSWDIR)\pnghand.obj \
 		$(MSWDIR)\printdlg.obj \
 		$(MSWDIR)\printwin.obj \
 		$(MSWDIR)\radiobox.obj \
@@ -234,6 +236,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\window.obj \
 		$(MSWDIR)\xpmhand.obj
 
+# Won't compile
+#		$(MSWDIR)\pnghand.obj \
+#
 # TODO: Implement XPM and PNG targets in this makefile!
 #  $(OLEDIR)\xpmhand \
 #  $(OLEDIR)\pnghand \
@@ -745,9 +750,9 @@ $(COMMDIR)/event.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/extended.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/extended.obj:     $*.c
         cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
 $(COMMDIR)/ffile.obj:     $*.$(SRCSUFF)
@@ -970,9 +975,9 @@ $(COMMDIR)/txtstrm.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/unzip.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/unzip.obj:     $*.c
         cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
 $(COMMDIR)/utilscmn.obj:     $*.$(SRCSUFF)
diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index e3c8964586..607c4f5826 100644
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -153,6 +153,8 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #ifndef __GNUWIN32__
 #ifdef __BORLANDC__
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
+#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+    LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
 #else
     LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
 #endif
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 4f1f806d3c..913713c566 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -200,8 +200,10 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 #if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
+#if !defined(__VISUALC__) || (__VISUALC__ != 1010)
     if ( m_windowStyle & wxTR_MULTIPLE )
         wstyle |= TVS_CHECKBOXES;
+#endif
 #endif
 
     // Create the tree control.
-- 
2.45.2