Merge branch 'master' of http://github.com/Twisol/mushclient

Author: nickgammon

MUSHclient.vcproj

@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="MUSHclient"
 	ProjectGUID="{A72BFD9B-2A5C-4509-BB92-593FF2C8CE95}"
+	RootNamespace="MUSHclient"
 	Keyword="MFCProj"
 	>
 	<Platforms>
@@ -57,9 +58,9 @@
 				AssemblerListingLocation=".\WinDebug/"
 				ObjectFile=".\WinDebug/"
 				ProgramDataBaseFileName=".\WinDebug/"
-				BrowseInformation="2"
+				BrowseInformation="1"
 				BrowseInformationFile=".\WinDebug/"
-				WarningLevel="3"
+				WarningLevel="1"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>

mcdatetime.cpp

@@ -92,14 +92,14 @@ CmcDateTimeSpan CmcDateTime::operator-(const CmcDateTime& date) const
 	if (GetStatus() == null || date.GetStatus() == null)
 	{
 		spanResult.SetStatus(COleDateTimeSpan::null);
-		return spanResult;
+		return (double)spanResult;
 	}
 
 	// If either operand invalid, result invalid
 	if (GetStatus() == invalid || date.GetStatus() == invalid)
 	{
 		spanResult.SetStatus(COleDateTimeSpan::invalid);
-		return spanResult;
+		return (double)spanResult;
 	}
 
 	// Return result (span can't be invalid, so don't check range)

mushview.cpp

@@ -62,12 +62,18 @@ static char BASED_CODE THIS_FILE[] = __FILE__;
 #define TTI_WARNING  2 // warning icon
 #define TTI_ERROR    3 // error icon 
 
-
-#define TTM_SETTITLEA           (WM_USER+32)
-#define TTM_SETTITLEW           (WM_USER+33)
+/*
+  JMC - "redefinition of macro" warnings fixed
+    These four are already defined with the same values
+	in commctrl.h (Platform SDK header)
+    TTM_SETTITLEA, TTM_SETTITLEW,
+	TTM_POPUP, TTM_GETTITLE
+*/
+//#define TTM_SETTITLEA           (WM_USER+32)
+//#define TTM_SETTITLEW           (WM_USER+33)
 #define TTM_SETTITLE            TTM_SETTITLEA
-#define TTM_POPUP               (WM_USER+34)
-#define TTM_GETTITLE            (WM_USER+35)
+//#define TTM_POPUP               (WM_USER+34)
+//#define TTM_GETTITLE            (WM_USER+35)
 #define TTM_SETWINDOWTHEME      CCM_SETWINDOWTHEME