From 05b4b8ee882d86d1095efe72e5c866d80bb4cc95 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Jun 2008 15:06:32 +0000
Subject: [PATCH] more compilation fixes for VC6 (#9492)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/rawbmp.h | 13 ++++++++++++-
 src/msw/app.cpp     |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 6a15042c23..dd0485d8a8 100644
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -680,7 +680,18 @@ struct wxPixelDataOut<wxBitmap>
 
 #endif //wxUSE_GUI
 
-template <class Image, class PixelFormat = typename wxPixelFormatFor<Image>::Format >
+// FIXME-VC6: VC6 doesn't like typename in default template parameters while
+//            it is necessary with standard-conforming compilers, remove this
+//            #define and just use typename when we drop VC6 support
+#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
+    #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
+#else
+    #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM typename
+#endif
+
+template <class Image,
+          class PixelFormat = wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
+                                wxPixelFormatFor<Image>::Format >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
 {
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9c5011f730..c24475e00e 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -103,6 +103,9 @@
     typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
 #endif // defined(DLLVERSIONINFO)
 
+#ifndef ATTACH_PARENT_PROCESS
+    #define ATTACH_PARENT_PROCESS ((DWORD)-1)
+#endif
 
 // ---------------------------------------------------------------------------
 // global variables