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

update to make digitalmars compile/link html sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-04-24 21:07:02 +00:00
parent 5bfebd013e
commit e9196d9c63
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/clipbrd.cpp
View File

@@ -174,6 +174,11 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
} }
} }
#ifdef __DIGITALMARS__
extern "C" HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp);
#endif
bool wxSetClipboardData(wxDataFormat dataFormat, bool wxSetClipboardData(wxDataFormat dataFormat,
const void *data, const void *data,
int width, int height) int width, int height)

3
src/msw/dib.cpp
View File

@@ -440,6 +440,9 @@ size_t wxDIB::ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp)
} }
/* static */ /* static */
#ifdef __DIGITALMARS__
extern "C"
#endif
HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp) HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
{ {
// first calculate the size needed // first calculate the size needed

8
src/msw/mimetype.cpp
View File

@@ -366,8 +366,16 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
wxString strExpPath = wxExpandEnvVars(strFullPath); wxString strExpPath = wxExpandEnvVars(strFullPath);
// here we need C based counting! // here we need C based counting!
int nIndex = wxAtoi(strIndex); 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 ) { switch ( (int)hIcon ) {
case 0: // means no icons were found case 0: // means no icons were found
case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/... case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/...