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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index b18e7bd98b3ac8a2bcc3aa6072bbb97888abbab5..c03b65fd46e3837b86787447bc76b575cc55e9f8 100644 (file)
--- 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)
 bool wxSetClipboardData(wxDataFormat dataFormat,
                         const void *data,
                         int width, int height)

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 9aa457995aa5eed14c0754a7a2e28ad6dc2c2ef0..31621f273403e8b23595fa92e527ff7bcd359c57 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -440,6 +440,9 @@ size_t wxDIB::ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp)
 }
 
 /* static */
 }
 
 /* static */

+#ifdef __DIGITALMARS__
+extern "C"
+#endif

 HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 {
     // first calculate the size needed
 HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 {
     // first calculate the size needed

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index bc4e634a05b4e0dfae36007013f7a9897aa07bcc..1d504dd9747b91dfbfd93c5ca6710abbb7d1158d 100644 (file)
--- 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);
             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);
 
             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/...
             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/...