Fixes for the VC6 project

build/win32/vc6/JUCE.dsp

@@ -1658,14 +1658,6 @@ SOURCE=..\..\..\src\juce_appframework\gui\components\special\juce_PreferencesPan
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\juce_appframework\gui\components\special\juce_QuickTimeMovieComponent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\components\special\juce_QuickTimeMovieComponent.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\juce_appframework\gui\components\special\juce_SystemTrayIconComponent.cpp
 # End Source File
 # Begin Source File
@@ -2497,6 +2489,10 @@ SOURCE=..\..\..\src\juce_core\cryptography\juce_RSAKey.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\platform_specific_code\juce_win32_ActiveXComponent.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\platform_specific_code\juce_win32_ASIO.cpp
 # End Source File
 # Begin Source File
@@ -2537,14 +2533,26 @@ SOURCE=..\platform_specific_code\juce_win32_Misc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\platform_specific_code\juce_win32_NativeCode.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\platform_specific_code\juce_win32_Network.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\platform_specific_code\juce_win32_OpenGLComponent.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\platform_specific_code\juce_win32_PlatformUtils.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\platform_specific_code\juce_win32_QuickTimeMovieComponent.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\platform_specific_code\juce_win32_SystemStats.cpp
 # End Source File
 # Begin Source File

extras/juce demo/build/win32_vc6/jucedemo.dsp

@@ -149,6 +149,10 @@ SOURCE=..\..\src\BinaryData.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\juce_LibrarySource.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\jucedemo_headers.h
 # End Source File
 # Begin Source File

juce_amalgamated.cpp

@@ -214012,10 +214012,9 @@ namespace pnglibNamespace
 
 #if JUCE_INCLUDE_PNGLIB_CODE
 
-  #if (! defined(_MSC_VER)) || _MSC_VER != 1310
-    using ::malloc; // (causes conflict in VS.NET 2003)
-    using ::free;
-  #endif
+  using ::calloc;
+  using ::malloc;
+  using ::free;
 
   extern "C"
   {
@@ -239415,10 +239414,7 @@ BEGIN_JUCE_NAMESPACE
 
 using namespace pnglibNamespace;
 
-#if defined (_MSC_VER) && _MSC_VER == 1310 && ! defined (JUCE_DEBUG)
-  using ::calloc;  // (needed in VS.NET 2003)
-#endif
-
+using ::calloc;
 using ::malloc;
 using ::free;
 

src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp

@@ -54,10 +54,9 @@ namespace pnglibNamespace
 
 #if JUCE_INCLUDE_PNGLIB_CODE
 
-  #if (! defined(_MSC_VER)) || _MSC_VER != 1310
-    using ::malloc; // (causes conflict in VS.NET 2003)
-    using ::free;
-  #endif
+  using ::calloc;
+  using ::malloc;
+  using ::free;
 
   extern "C"
   {
@@ -109,10 +108,7 @@ BEGIN_JUCE_NAMESPACE
 
 using namespace pnglibNamespace;
 
-#if defined (_MSC_VER) && _MSC_VER == 1310 && ! defined (JUCE_DEBUG)
-  using ::calloc;  // (needed in VS.NET 2003)
-#endif
-
+using ::calloc;
 using ::malloc;
 using ::free;