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

Corrected XPM-related cast in resource.cpp; added generic Blitting code in wxPostScriptDC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-04 20:28:50 +00:00
parent 2a6f6231ce
commit 45b776d452
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/resource.cpp
View File

@@ -2173,7 +2173,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
"Forgot to use wxResourceLoadBitmapData?"), (const char*) name); "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
return wxNullBitmap; return wxNullBitmap;
} }
return wxBitmap((const char **)item->GetValue1()); return wxBitmap((char **)item->GetValue1());
#else #else
wxLogWarning(_("No XPM facility available!")); wxLogWarning(_("No XPM facility available!"));
#endif #endif

8
src/generic/dcpsg.cpp
View File

@@ -1474,7 +1474,7 @@ bool wxPostScriptDC::Blit( long xdest, long ydest,
long fwidth, long fheight, long fwidth, long fheight,
wxDC *source, wxDC *source,
long xsrc, long ysrc, long xsrc, long ysrc,
int WXUNUSED(rop), bool WXUNUSED(useMask) ) int rop, bool WXUNUSED(useMask) )
{ {
wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" );
@@ -1495,6 +1495,12 @@ bool wxPostScriptDC::Blit( long xdest, long ydest,
gdk_window_copy_area( bitmap.GetPixmap(), gc, 0, 0, gdk_window_copy_area( bitmap.GetPixmap(), gc, 0, 0,
srcDC->GetWindow(), srcDC->GetWindow(),
xsrc, ysrc, fwidth, fheight ); xsrc, ysrc, fwidth, fheight );
#else
wxMemoryDC memDC;
memDC.SelectObject(bitmap);
// TODO: Do we want to blit transparently?
memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop);
memDC.SelectObject(wxNullBitmap);
#endif #endif
/* draw bitmap. scaling and positioning is done there */ /* draw bitmap. scaling and positioning is done there */