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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/bitmap.cpp
View File

@@ -86,7 +86,7 @@ void wxBitmapRefData::Free()
{
if ( !::DeleteObject((HBITMAP)m_hBitmap) )
{
wxLogLastError("DeleteObject(hbitmap)");
wxLogLastError(wxT("DeleteObject(hbitmap)"));
}
}
@@ -117,7 +117,7 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
ICONINFO iconInfo;
if ( !::GetIconInfo(hicon, &iconInfo) )
{
wxLogLastError("GetIconInfo");
wxLogLastError(wxT("GetIconInfo"));
return FALSE;
}
@@ -269,7 +269,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);
if ( !hbmp )
{
wxLogLastError("CreateBitmap");
wxLogLastError(wxT("CreateBitmap"));
}
if ( data != bits )
@@ -326,7 +326,7 @@ bool wxBitmap::Create(int w, int h, int d)
hbmp = ::CreateBitmap(w, h, 1, d, NULL);
if ( !hbmp )
{
wxLogLastError("CreateBitmap");
wxLogLastError(wxT("CreateBitmap"));
}
}
else
@@ -335,7 +335,7 @@ bool wxBitmap::Create(int w, int h, int d)
hbmp = ::CreateCompatibleBitmap(dc, w, h);
if ( !hbmp )
{
wxLogLastError("CreateCompatibleBitmap");
wxLogLastError(wxT("CreateCompatibleBitmap"));
}
GetBitmapData()->m_depth = wxDisplayDepth();
@@ -382,8 +382,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
if ( !handler )
{
wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for "
"type %d defined."), type);
wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %d defined."), type);
return FALSE;
}
@@ -653,7 +652,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
HDC destDC = ::CreateCompatibleDC(NULL);
if ( !srcDC || !destDC )
{
wxLogLastError("CreateCompatibleDC");
wxLogLastError(wxT("CreateCompatibleDC"));
}
bool ok = TRUE;
@@ -661,7 +660,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
if ( !hbmpSrcOld )
{
wxLogLastError("SelectObject");
wxLogLastError(wxT("SelectObject"));
ok = FALSE;
}
@@ -669,7 +668,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
if ( !hbmpDstOld )
{
wxLogLastError("SelectObject");
wxLogLastError(wxT("SelectObject"));
ok = FALSE;
}
@@ -683,7 +682,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
COLORREF col = GetPixel(srcDC, w, h);
if ( col == CLR_INVALID )
{
wxLogLastError("GetPixel");
wxLogLastError(wxT("GetPixel"));
// doesn't make sense to continue
ok = FALSE;
@@ -843,13 +842,13 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
HDC hdcDst = ::CreateCompatibleDC(NULL);
if ( !hdcSrc || !hdcDst )
{
wxLogLastError("CreateCompatibleDC");
wxLogLastError(wxT("CreateCompatibleDC"));
}
HBITMAP hbmpInvMask = ::CreateBitmap(w, h, 1, 1, 0);
if ( !hbmpInvMask )
{
wxLogLastError("CreateBitmap");
wxLogLastError(wxT("CreateBitmap"));
}
::SelectObject(hdcSrc, hbmpMask);
@@ -858,7 +857,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
hdcSrc, 0, 0,
NOTSRCCOPY) )
{
wxLogLastError("BitBlt");
wxLogLastError(wxT("BitBlt"));
}
::DeleteDC(hdcSrc);