Applied patch to reorder includes. Not the most

important patch in the world, but still.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-11-03 21:13:28 +00:00
parent cd86bf1e7e
commit e1bf3ad3e8
32 changed files with 70 additions and 44 deletions

View File

@@ -442,14 +442,34 @@ bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord
void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
{
DoDrawBitmap( icon, x, y, true );
}
void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
{
if (!bitmap.Ok()) return;
#if 0
// TODO do something clever here
if (bitmap.HasPixbuf())
{
}
else
#endif
{
wxImage image = bitmap.ConvertToImage();
if (!image.Ok()) return;
gnome_print_moveto (m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
}
}
void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
{
return;
if (m_textForegroundColour.Ok())
{
unsigned char red = m_textForegroundColour.Red();