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

Cured SetString/GetSelection interaction; incorporated Chris's changes to wxDC:Blit

Browse Source 
for printer DCs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-16 08:34:29 +00:00
parent 1eb20d4a08
commit 400735a8fa
3 changed files with 93 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/msw/dc.cpp
View File

@@ -1181,53 +1181,107 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
::SelectObject(dc_mask, 0); ::SelectObject(dc_mask, 0);
::DeleteDC(dc_mask); ::DeleteDC(dc_mask);
#endif #endif
// New code from Chris Breeze, 8/5/98 // New code from Chris Breeze, 15/7/98
// Blit bitmap with mask
// create a temp buffer bitmap and DCs to access it and the mask if (IsKindOf(CLASSINFO(wxPrinterDC)))
HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); {
HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); // If we are printing source colours are screen colours
HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); // not printer colours and so we need copy the bitmap
::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); // pixel by pixel.
::SelectObject(dc_buffer, buffer_bmap); RECT rect;
HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
HDC dc_src = (HDC) source->m_hDC;
// copy dest to buffer ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, for (int x = 0; x < width; x++)
(HDC) m_hDC, xdest1, ydest1, SRCCOPY); {
for (int y = 0; y < height; y++)
{
COLORREF cref = ::GetPixel(dc_mask, x, y);
if (cref)
{
HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
rect.left = xdest1 + x; rect.right = rect.left + 1;
rect.top = ydest1 + y; rect.bottom = rect.top + 1;
::FillRect((HDC) m_hDC, &rect, brush);
::DeleteObject(brush);
}
}
}
::SelectObject(dc_mask, 0);
::DeleteDC(dc_mask);
}
else
{
// create a temp buffer bitmap and DCs to access it and the mask
HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC);
HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height);
::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
::SelectObject(dc_buffer, buffer_bmap);
// copy src to buffer using selected raster op // copy dest to buffer
::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
(HDC) source->m_hDC, xsrc1, ysrc1, dwRop); (HDC) m_hDC, xdest1, ydest1, SRCCOPY);
// set masked area in buffer to BLACK (pixel value 0) // copy src to buffer using selected raster op
COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); (HDC) source->m_hDC, xsrc1, ysrc1, dwRop);
::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
dc_mask, xsrc1, ysrc1, SRCAND);
// set unmasked area in dest to BLACK // set masked area in buffer to BLACK (pixel value 0)
::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255));
::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0));
::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
dc_mask, xsrc1, ysrc1, SRCAND); dc_mask, xsrc1, ysrc1, SRCAND);
::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values
::SetTextColor((HDC) m_hDC, prevCol);
// OR buffer to dest // set unmasked area in dest to BLACK
success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0));
dc_buffer, 0, 0, SRCPAINT) != 0); ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255));
::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
dc_mask, xsrc1, ysrc1, SRCAND);
::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values
::SetTextColor((HDC) m_hDC, prevCol);
// tidy up temporary DCs and bitmap // OR buffer to dest
::SelectObject(dc_mask, 0); success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
::DeleteDC(dc_mask); dc_buffer, 0, 0, SRCPAINT) != 0);
::SelectObject(dc_buffer, 0);
::DeleteDC(dc_buffer); // tidy up temporary DCs and bitmap
::DeleteObject(buffer_bmap); ::SelectObject(dc_mask, 0);
} ::DeleteDC(dc_mask);
::SelectObject(dc_buffer, 0);
::DeleteDC(dc_buffer);
::DeleteObject(buffer_bmap);
}
}
} }
else else
{ {
if (IsKindOf(CLASSINFO(wxPrinterDC)))
{
// If we are printing source colours are screen colours
// not printer colours and so we need copy the bitmap
// pixel by pixel.
HDC dc_src = (HDC) source->m_hDC;
RECT rect;
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
{
HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
rect.left = xdest1 + x; rect.right = rect.left + 1;
rect.top = ydest1 + y; rect.bottom = rect.top + 1;
::FillRect((HDC) m_hDC, &rect, brush);
::DeleteObject(brush);
}
}
}
else
{
success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
xsrc1, ysrc1, dwRop) != 0); xsrc1, ysrc1, dwRop) != 0);
}
} }
::SetTextColor((HDC)m_hDC, old_textground); ::SetTextColor((HDC)m_hDC, old_textground);
::SetBkColor((HDC)m_hDC, old_background); ::SetBkColor((HDC)m_hDC, old_background);

4
src/msw/listbox.cpp
View File

@@ -606,7 +606,9 @@ wxListBox::InsertItems(int nItems, const wxString items[], int pos)
void wxListBox::SetString(int N, const wxString& s) void wxListBox::SetString(int N, const wxString& s)
{ {
int sel = GetSelection(); int sel = -1;
if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED))
sel = GetSelection();
char *oldData = (char *)wxListBox::GetClientData(N); char *oldData = (char *)wxListBox::GetClientData(N);

2
src/msw/mdi.cpp
View File

@@ -431,7 +431,7 @@ bool wxMDIParentFrame::MSWOnDestroy(void)
void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs)) void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
{ {
m_clientWindow = new wxMDIClientWindow; m_clientWindow = OnCreateClient();
// Uses own style for client style // Uses own style for client style
m_clientWindow->CreateClient(this, GetWindowStyleFlag()); m_clientWindow->CreateClient(this, GetWindowStyleFlag());
} }