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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index fc9b8f507aa7ec50e7473989b9a46bde1d174010..347446ea8b1900b7eaf5824fabb28155f998458c 100644 (file)
--- 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 211d81b63e94ec0443c91f0967027976f45db451..4fac5ff954b2a9abfdcaeec35a30ba5cc7b3d469 100644 (file)
--- 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 */