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
This commit is contained in:
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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/...
|
||||
|
Reference in New Issue
Block a user