cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more compilation fixes for VC6 (#9492)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-06-07 15:06:32 +00:00
parent faba238f8e
commit 05b4b8ee88
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/rawbmp.h
View File

@ -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>
{

3
src/msw/app.cpp
View File

@ -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