From e9196d9c63d36656bfd53fd115d80572349b2c0a Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Thu, 24 Apr 2003 21:07:02 +0000
Subject: [PATCH] update to make digitalmars compile/link html sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/msw/clipbrd.cpp | 5 +++++
src/msw/dib.cpp | 3 +++
src/msw/mimetype.cpp | 8 ++++++++
3 files changed, 16 insertions(+)
diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index b18e7bd98b..c03b65fd46 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -174,6 +174,11 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
}
}
+#ifdef __DIGITALMARS__
+extern "C" HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp);
+#endif
+
+
bool wxSetClipboardData(wxDataFormat dataFormat,
const void *data,
int width, int height)
diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 9aa457995a..31621f2734 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -440,6 +440,9 @@ size_t wxDIB::ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp)
}
/* static */
+#ifdef __DIGITALMARS__
+extern "C"
+#endif
HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
{
// first calculate the size needed
diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index bc4e634a05..1d504dd974 100644
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -366,8 +366,16 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
wxString strExpPath = wxExpandEnvVars(strFullPath);
// here we need C based counting!
int nIndex = wxAtoi(strIndex);
+#ifdef __DIGITALMARS__
+//FIXME __DIGITALMARS__ April 2003 CE
+ // why no ExtractIcon in library
+ wxLogTrace(_T("wxFileTypeImpl::GetIcon"),
+ _T("Returning false from wxFileTypeImpl::GetIcon because of DigitalMars compiler bug"));
+ HICON hIcon = 0 ;
+#else
HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);
+#endif
switch ( (int)hIcon ) {
case 0: // means no icons were found
case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/...
--
2.47.2