--- Main/Forms/VolumeSizeWizardPage.cpp	2008-02-04 05:14:46.000000000 -0600
+++ Main/Forms/VolumeSizeWizardPage.cpp	2008-02-13 20:05:27.000000000 -0600
@@ -55,7 +55,7 @@
 	{
 		uint64 prefixMult = 1;
 		if (VolumeSizePrefixChoice->GetSelection() != wxNOT_FOUND)
-			prefixMult = reinterpret_cast <int> (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection()));
+			prefixMult = reinterpret_cast <int64> (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection()));
 		
 		uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue()));
 		if (val <= 0x7fffFFFFffffFFFFull / prefixMult)

--- Main/Main.make	2008-02-12 02:55:44.000000000 -0600
+++ Main/Main.make	2008-02-13 20:06:55.000000000 -0600
@@ -67,13 +67,13 @@
 
 ifeq "$(TC_BUILD_CONFIG)" "Release"
 
-CXXFLAGS += $(shell $(WX_BUILD_DIR)/wx-config --unicode --static --cxxflags)
-WX_LIBS = $(shell $(WX_BUILD_DIR)/wx-config --unicode --static --libs adv,core,base)
+CXXFLAGS += $(shell wx-config --unicode --cxxflags)
+WX_LIBS = $(shell wx-config --unicode --libs adv,core,base)
 
 else
 
-CXXFLAGS += $(shell $(WX_BUILD_DIR)/wx-config --debug --unicode --static --cxxflags)
-WX_LIBS = $(shell $(WX_BUILD_DIR)/wx-config --debug --unicode --static --libs adv,core,base)
+CXXFLAGS += $(shell wx-config --debug --unicode --cxxflags)
+WX_LIBS = $(shell wx-config --debug --unicode --libs adv,core,base)
 
 endif
 
--- Main/StringFormatter.h	2008-02-04 05:14:14.000000000 -0600
+++ Main/StringFormatter.h	2008-02-13 20:08:16.000000000 -0600
@@ -27,11 +27,11 @@
 		StringFormatterArg (const wstring &str) :	Empty (false), Referenced (false), StringArg (str) { }
 		StringFormatterArg (const wxString &str) :	Empty (false), Referenced (false), StringArg (str) { }
 		StringFormatterArg (int number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
-		StringFormatterArg (int64 number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
+		//StringFormatterArg (int64 number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
 		StringFormatterArg (long number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
 		StringFormatterArg (unsigned int number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
 		StringFormatterArg (unsigned long number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
-		StringFormatterArg (uint64 number) :		Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
+		//StringFormatterArg (uint64 number) :		Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
 
 		operator wxString () { Referenced = true; return StringArg; }
 
--- Platform/PlatformTest.cpp	2008-02-04 05:14:16.000000000 -0600
+++ Platform/PlatformTest.cpp	2008-02-13 20:09:38.000000000 -0600
@@ -270,7 +270,7 @@
 		// shared_ptr, make_shared, StringConverter, foreach
 		list <shared_ptr <uint64> > numList;
 		
-		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeULL))));
+		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber ((long unsigned int)0xFFFFffffFFFFfffeULL))));
 		numList.push_front (make_shared <uint64> (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));
 		numList.push_front (make_shared <uint64> (3));
 
--- Platform/StringConverter.cpp	2008-02-04 05:14:18.000000000 -0600
+++ Platform/StringConverter.cpp	2008-02-13 20:10:54.000000000 -0600
@@ -32,13 +32,13 @@
 		return s.str();
 	}
 
-	wstring StringConverter::FromNumber (int64 number)
+/*	wstring StringConverter::FromNumber (int64 number)
 	{
 		wstringstream s;
 		s << number;
 		return s.str();
 	}
-
+*/
 	wstring StringConverter::FromNumber (int number)
 	{
 		wstringstream s;
@@ -60,13 +60,13 @@
 		return s.str();
 	}
 
-	wstring StringConverter::FromNumber (uint64 number)
+/*	wstring StringConverter::FromNumber (uint64 number)
 	{
 		wstringstream s;
 		s << number;
 		return s.str();
 	}
-
+*/
 	string StringConverter::GetTrailingNumber (const string &str)
 	{
 		size_t start = str.find_last_not_of ("0123456789");

--- Platform/StringConverter.h	2008-02-04 05:14:16.000000000 -0600
+++ Platform/StringConverter.h	2008-02-13 20:12:08.000000000 -0600
@@ -19,11 +19,11 @@
 	public:
 		static wstring FromNumber (double number);
 		static wstring FromNumber (int number);
-		static wstring FromNumber (int64 number);
+		//static wstring FromNumber (int64 number);
 		static wstring FromNumber (long number);
 		static wstring FromNumber (unsigned int number);
 		static wstring FromNumber (unsigned long number);
-		static wstring FromNumber (uint64 number);
+		//static wstring FromNumber (uint64 number);
 		static string GetTrailingNumber (const string &str);
 		static string GetTypeName (const type_info &typeInfo);
 		static wstring QuoteSpaces (const wstring &str);