fixed invalid cast of wxWindowDCImpl to wxDC in DoGetPixel()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index be87f5dd6d63ab3afe8ed2ffcc74d80b0519f8bf..498f19623a16fed8e3c1c9b18397ac9f423e4265 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -444,7 +444,7 @@ bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     wxMemoryDC memdc;
     wxBitmap bitmap(1, 1);
     memdc.SelectObject(bitmap);
     wxMemoryDC memdc;
     wxBitmap bitmap(1, 1);
     memdc.SelectObject(bitmap);

-    memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+    memdc.Blit(0, 0, 1, 1, GetOwner(), x1, y1);

     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();
     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 375f968e9556fa98093b1976b844ef993f395e84..ee4e22a33adde4bb9882e4783143160fd636b7a4 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -236,7 +236,7 @@ bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     wxMemoryDC memdc;
     wxBitmap bitmap(1, 1);
     memdc.SelectObject(bitmap);
     wxMemoryDC memdc;
     wxBitmap bitmap(1, 1);
     memdc.SelectObject(bitmap);

-    memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+    memdc.Blit(0, 0, 1, 1, GetOwner(), x1, y1);

     memdc.SelectObject(wxNullBitmap);
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     memdc.SelectObject(wxNullBitmap);
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));