X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bc67cc550bcd9d5f93f88ae22a4f6ac7fafb5f7..2d9cdc4b6947fa5fb05aca64673ca170c66141cf:/src/gtk/dcclient.cpp diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 0b2a1391cd..7e9d82bd16 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -16,6 +16,9 @@ #include "wx/image.h" #include +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // local data //----------------------------------------------------------------------------- @@ -585,12 +588,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, } gdk_draw_pixmap( m_window, m_penGC, pmap, - source->DeviceToLogicalX(xsrc), - source->DeviceToLogicalY(ysrc), + source->LogicalToDeviceX(xsrc), + source->LogicalToDeviceY(ysrc), xx, yy, - source->DeviceToLogicalXRel(width), - source->DeviceToLogicalYRel(height) ); + source->LogicalToDeviceXRel(width), + source->LogicalToDeviceYRel(height) ); if (useMask && mask) { @@ -618,12 +621,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, } gdk_draw_bitmap( m_window, m_textGC, bmap, - source->DeviceToLogicalX(xsrc), - source->DeviceToLogicalY(ysrc), + source->LogicalToDeviceX(xsrc), + source->LogicalToDeviceY(ysrc), xx, yy, - source->DeviceToLogicalXRel(width), - source->DeviceToLogicalYRel(height) ); + source->LogicalToDeviceXRel(width), + source->LogicalToDeviceYRel(height) ); if (useMask && mask) { @@ -639,10 +642,10 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, gdk_window_copy_area ( m_window, m_penGC, XLOG2DEV(xdest), YLOG2DEV(ydest), csrc->GetWindow(), - source->DeviceToLogicalX(xsrc), - source->DeviceToLogicalY(ysrc), - source->DeviceToLogicalXRel(width), - source->DeviceToLogicalYRel(height) ); + source->LogicalToDeviceX(xsrc), + source->LogicalToDeviceY(ysrc), + source->LogicalToDeviceXRel(width), + source->LogicalToDeviceYRel(height) ); SetLogicalFunction( old_logical_func ); return TRUE;