From 45b776d4529cd8055492a7b732a17ad5b87cdccd Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 4 Feb 1999 20:28:50 +0000 Subject: [PATCH] Corrected XPM-related cast in resource.cpp; added generic Blitting code in wxPostScriptDC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/resource.cpp | 2 +- src/generic/dcpsg.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/resource.cpp b/src/common/resource.cpp index fc9b8f507a..347446ea8b 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -2173,7 +2173,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table "Forgot to use wxResourceLoadBitmapData?"), (const char*) name); return wxNullBitmap; } - return wxBitmap((const char **)item->GetValue1()); + return wxBitmap((char **)item->GetValue1()); #else wxLogWarning(_("No XPM facility available!")); #endif diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 211d81b63e..4fac5ff954 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -1474,7 +1474,7 @@ bool wxPostScriptDC::Blit( long xdest, long ydest, long fwidth, long fheight, wxDC *source, 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" ); @@ -1495,6 +1495,12 @@ bool wxPostScriptDC::Blit( long xdest, long ydest, gdk_window_copy_area( bitmap.GetPixmap(), gc, 0, 0, srcDC->GetWindow(), 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 /* draw bitmap. scaling and positioning is done there */ -- 2.45.2