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:
Julian Smart
2000-08-20 19:55:35 +00:00
parent cff4d2f859
commit 07793870fb
10 changed files with 44 additions and 29 deletions

View File

@@ -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() )