Small mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
* Copyright: (C) 1998, Robert Roebling
|
||||
*
|
||||
*/
|
||||
|
||||
// For compilers that support precompilation, includes "wx/wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
@@ -340,7 +339,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
|
||||
dc.SetTextForeground( "BLACK" );
|
||||
}
|
||||
|
||||
|
||||
// Doesn't work for wxMotif yet
|
||||
#ifndef __WXMOTIF__
|
||||
wxBitmap mono( 60,50,1 );
|
||||
wxMemoryDC memdc;
|
||||
memdc.SelectObject( mono );
|
||||
@@ -376,6 +376,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
|
||||
dc.DrawBitmap( i.ConvertToBitmap(), 150, 1900, TRUE );
|
||||
dc.SetTextForeground( "BLACK" );
|
||||
}
|
||||
#endif
|
||||
|
||||
dc.DrawText("XPM bitmap", 30, 2000);
|
||||
if ( m_bmpSmileXpm.Ok() )
|
||||
|
Reference in New Issue
Block a user