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

image sample no longer crashes under GTK2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-10-09 19:40:42 +00:00
parent 5ecd5fcd23
commit 0ac860470c
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/image/image.cpp
View File

@@ -554,22 +554,22 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetTextForeground( _T("GREEN") ); dc.SetTextForeground( _T("GREEN") );
dc.SetTextBackground( _T("RED") ); dc.SetTextBackground( _T("RED") );
dc.DrawBitmap( *my_smile_xbm, 30, 2010 ); dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
dc.SetTextForeground( wxT("BLACK") ); dc.SetTextForeground( wxT("BLACK") );
dc.DrawText( _T("After wxImage conversion"), 150, 1975 ); dc.DrawText( _T("After wxImage conversion"), 150, 1975 );
dc.DrawText( _T("(red on white)"), 150, 1990 ); dc.DrawText( _T("(red on white)"), 150, 1990 );
dc.SetTextForeground( wxT("RED") ); dc.SetTextForeground( wxT("RED") );
wxImage i = my_smile_xbm->ConvertToImage(); wxImage img = my_smile_xbm->ConvertToImage();
i.SetMaskColour( 255, 255, 255 ); img.SetMaskColour( 255, 255, 255 );
i.Replace( 0, 0, 0, img.Replace( 0, 0, 0,
wxRED_PEN->GetColour().Red(), wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(), wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() ); wxRED_PEN->GetColour().Blue() );
dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE ); wxBitmap bmp( img );
dc.DrawBitmap( bmp, 150, 2010, TRUE );
dc.SetTextForeground( wxT("BLACK") ); dc.SetTextForeground( wxT("BLACK") );
} }
wxBitmap mono( 60,50,1 ); wxBitmap mono( 60,50,1 );
wxMemoryDC memdc; wxMemoryDC memdc;
memdc.SelectObject( mono ); memdc.SelectObject( mono );
@@ -577,7 +577,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
memdc.SetBrush( *wxWHITE_BRUSH ); memdc.SetBrush( *wxWHITE_BRUSH );
memdc.DrawRectangle( 0,0,60,50 ); memdc.DrawRectangle( 0,0,60,50 );
memdc.SetTextForeground( *wxBLACK ); memdc.SetTextForeground( *wxBLACK );
#ifndef __WXGTK20__
// I cannot convince GTK2 to draw into mono bitmaps
memdc.DrawText( _T("Hi!"), 5, 5 ); memdc.DrawText( _T("Hi!"), 5, 5 );
#endif
memdc.SetBrush( *wxBLACK_BRUSH ); memdc.SetBrush( *wxBLACK_BRUSH );
memdc.DrawRectangle( 33,5,20,20 ); memdc.DrawRectangle( 33,5,20,20 );
memdc.SetPen( *wxRED_PEN ); memdc.SetPen( *wxRED_PEN );
@@ -591,7 +594,6 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetTextForeground( wxT("RED") ); dc.SetTextForeground( wxT("RED") );
dc.SetTextBackground( wxT("GREEN") ); dc.SetTextBackground( wxT("GREEN") );
dc.DrawBitmap( mono, 30, 2130 ); dc.DrawBitmap( mono, 30, 2130 );
dc.SetTextForeground( wxT("BLACK") ); dc.SetTextForeground( wxT("BLACK") );
dc.DrawText( _T("After wxImage conversion"), 150, 2095 ); dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
dc.DrawText( _T("(red on white)"), 150, 2110 ); dc.DrawText( _T("(red on white)"), 150, 2110 );
@@ -608,15 +610,11 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.DrawText(_T("XPM bitmap"), 30, 2230); dc.DrawText(_T("XPM bitmap"), 30, 2230);
if ( m_bmpSmileXpm.Ok() ) if ( m_bmpSmileXpm.Ok() )
{
dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE); dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
}
dc.DrawText(_T("XPM icon"), 150, 2230); dc.DrawText(_T("XPM icon"), 150, 2230);
if ( m_iconSmileXpm.Ok() ) if ( m_iconSmileXpm.Ok() )
{
dc.DrawIcon(m_iconSmileXpm, 150, 2250); dc.DrawIcon(m_iconSmileXpm, 150, 2250);
}
dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 ); dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 );
if (my_horse_ico32 && my_horse_ico32->Ok()) if (my_horse_ico32 && my_horse_ico32->Ok())