black now denotes 0 on mono-bitmaps.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -271,14 +271,18 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
|
||||
}
|
||||
dc.SetTextForeground( "BLACK" );
|
||||
|
||||
wxBitmap mono( 30,30,1 );
|
||||
wxBitmap mono( 60,50,1 );
|
||||
wxMemoryDC memdc;
|
||||
memdc.SelectObject( mono );
|
||||
memdc.SetPen( *wxTRANSPARENT_PEN );
|
||||
memdc.SetBrush( *wxBLACK_BRUSH );
|
||||
memdc.DrawRectangle( 0,0,30,30 );
|
||||
memdc.SetBrush( *wxWHITE_BRUSH );
|
||||
memdc.DrawRectangle( 5,5,20,20 );
|
||||
memdc.DrawRectangle( 0,0,60,50 );
|
||||
memdc.SetTextForeground( *wxBLACK );
|
||||
memdc.DrawText( "Hi!", 5, 5 );
|
||||
memdc.SetBrush( *wxBLACK_BRUSH );
|
||||
memdc.DrawRectangle( 33,5,20,20 );
|
||||
memdc.SetPen( *wxRED_PEN );
|
||||
memdc.DrawLine( 5, 42, 50, 42 );
|
||||
memdc.SelectObject( wxNullBitmap );
|
||||
if (mono.Ok())
|
||||
{
|
||||
@@ -390,8 +394,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
|
||||
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
|
||||
{
|
||||
(void)wxMessageBox( "wxImage demo\n"
|
||||
"\n"
|
||||
"Robert Roebling (c) 1998",
|
||||
"Robert Roebling (c) 1998,2000",
|
||||
"About wxImage Demo", wxICON_INFORMATION | wxOK );
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user