From: Robert Roebling Date: Mon, 16 Nov 1998 14:38:46 +0000 (+0000) Subject: Hm, FortyThieves' cards were all black. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ee5e8025711fb3938bc62ec23297713caf63551c Hm, FortyThieves' cards were all black. MDI insert child bug. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 8fdd39e4ce..0d0d479bf7 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -552,11 +552,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, mask ); - gdk_gc_set_clip_origin( m_penGC, xx, yy ); + gdk_gc_set_clip_mask( m_textGC, mask ); + gdk_gc_set_clip_origin( m_textGC, xx, yy ); } - gdk_draw_pixmap( m_window, m_penGC, pmap, + gdk_draw_pixmap( m_window, m_textGC, pmap, source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc), xx, @@ -566,8 +566,8 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); - gdk_gc_set_clip_origin( m_penGC, 0, 0 ); + gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL ); + gdk_gc_set_clip_origin( m_textGC, 0, 0 ); } return TRUE; @@ -584,11 +584,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, mask ); - gdk_gc_set_clip_origin( m_penGC, xx, yy ); + gdk_gc_set_clip_mask( m_textGC, mask ); + gdk_gc_set_clip_origin( m_textGC, xx, yy ); } - gdk_draw_bitmap( m_window, m_penGC, bmap, + gdk_draw_bitmap( m_window, m_textGC, bmap, source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc), xx, @@ -598,15 +598,15 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); - gdk_gc_set_clip_origin( m_penGC, 0, 0 ); + gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL ); + gdk_gc_set_clip_origin( m_textGC, 0, 0 ); } return TRUE; } } - gdk_window_copy_area ( m_window, m_penGC, + gdk_window_copy_area ( m_window, m_textGC, XLOG2DEV(xdest), YLOG2DEV(ydest), csrc->GetWindow(), source->DeviceToLogicalX(xsrc), @@ -615,7 +615,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, source->DeviceToLogicalYRel(height) ); /* - gdk_window_copy_area ( m_window, m_penGC, + gdk_window_copy_area ( m_window, m_textGC, XLOG2DEV(xdest), YLOG2DEV(ydest), csrc->GetWindow(), xsrc, ysrc, diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 541afecfe8..4b3a894b75 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -358,7 +358,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y ); + m_parent->AddChild( this ); + + (m_parent->m_insertCallback)( m_parent, this ); PostCreation(); diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 8fdd39e4ce..0d0d479bf7 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -552,11 +552,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, mask ); - gdk_gc_set_clip_origin( m_penGC, xx, yy ); + gdk_gc_set_clip_mask( m_textGC, mask ); + gdk_gc_set_clip_origin( m_textGC, xx, yy ); } - gdk_draw_pixmap( m_window, m_penGC, pmap, + gdk_draw_pixmap( m_window, m_textGC, pmap, source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc), xx, @@ -566,8 +566,8 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); - gdk_gc_set_clip_origin( m_penGC, 0, 0 ); + gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL ); + gdk_gc_set_clip_origin( m_textGC, 0, 0 ); } return TRUE; @@ -584,11 +584,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, mask ); - gdk_gc_set_clip_origin( m_penGC, xx, yy ); + gdk_gc_set_clip_mask( m_textGC, mask ); + gdk_gc_set_clip_origin( m_textGC, xx, yy ); } - gdk_draw_bitmap( m_window, m_penGC, bmap, + gdk_draw_bitmap( m_window, m_textGC, bmap, source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc), xx, @@ -598,15 +598,15 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (useMask && mask) { - gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); - gdk_gc_set_clip_origin( m_penGC, 0, 0 ); + gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL ); + gdk_gc_set_clip_origin( m_textGC, 0, 0 ); } return TRUE; } } - gdk_window_copy_area ( m_window, m_penGC, + gdk_window_copy_area ( m_window, m_textGC, XLOG2DEV(xdest), YLOG2DEV(ydest), csrc->GetWindow(), source->DeviceToLogicalX(xsrc), @@ -615,7 +615,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, source->DeviceToLogicalYRel(height) ); /* - gdk_window_copy_area ( m_window, m_penGC, + gdk_window_copy_area ( m_window, m_textGC, XLOG2DEV(xdest), YLOG2DEV(ydest), csrc->GetWindow(), xsrc, ysrc, diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 541afecfe8..4b3a894b75 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -358,7 +358,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y ); + m_parent->AddChild( this ); + + (m_parent->m_insertCallback)( m_parent, this ); PostCreation();