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

Forgot one.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-01-13 00:44:31 +00:00
parent b75867a61b
commit 2545db4133
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/image/image.cpp
View File

@@ -140,12 +140,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetBrush( wxBrush( "orange", wxSOLID ) ); dc.SetBrush( wxBrush( "orange", wxSOLID ) );
dc.SetPen( *wxWHITE_PEN ); dc.SetPen( *wxWHITE_PEN );
dc.DrawRectangle( 150, 120, 100, 100 ); dc.DrawRectangle( 150, 120, 100, 100 );
<<<<<<< image.cpp
#endif #endif
=======
>>>>>>> 1.11
if (my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 240 ); if (my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 240 );
} }