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

1. more test code for drawing with ROPs/masks/bg brushes in drawing

Browse Source 
2. wxListCtrl colour setting tests added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-08 01:07:48 +00:00
parent 2edc119be3
commit 11f26ea0e2
3 changed files with 83 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/drawing/drawing.cpp
View File

@@ -570,11 +570,26 @@ void MyCanvas::DrawDefault(wxDC& dc)
dc.FloodFill(0, 0, wxColour(255, 0, 0));
#endif //
dc.DrawIcon( wxICON(mondrian), 410, 40 );
dc.DrawIcon( wxICON(mondrian), 40, 40 );
// this is the test for "blitting bitmap into DC damages selected brush"
// bug
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush( *wxGREEN_BRUSH );
dc.DrawRectangle(100, 10, 40, 40);
dc.DrawBitmap(wxTheApp->GetStdIcon(wxICON_INFORMATION), 102, 12, TRUE);
dc.DrawRectangle(150, 10, 40, 40);
dc.DrawIcon(wxTheApp->GetStdIcon(wxICON_INFORMATION), 152, 12);
dc.DrawRectangle(200, 10, 40, 40);
// test for "transparent" bitmap drawing (it intersects with the last
// rectangle above)
//dc.SetBrush( *wxTRANSPARENT_BRUSH );
#include "../image/smile.xpm"
wxBitmap bmp(smile_xpm);
dc.DrawBitmap(bmp, 210, 30, TRUE);
dc.SetBrush( *wxBLACK_BRUSH );
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle( 0, 160, 1000, 300 );
// draw lines
@@ -772,6 +787,7 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
// reuse the text colour here
dc.SetPen(wxPen(m_owner->m_colourForeground, 1, wxSOLID));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
for ( size_t n = 0; n < WXSIZEOF(rasterOperations); n++ )
{
@@ -780,7 +796,7 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
dc.DrawText(rasterOperations[n].name, x, y - 20);
dc.SetLogicalFunction(rasterOperations[n].rop);
//dc.DrawRectangle(x, y, w, h);
dc.DrawRectangle(x, y, w, h);
dc.DrawLine(x, y, x + w, y + h);
dc.DrawLine(x + w, y, x, y + h);
}