Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hm, FortyThieves' cards were all black.

Browse Source 
MDI insert child bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-11-16 14:38:46 +00:00
parent 4259a48e0b
commit ee5e802571
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/dcclient.cpp
View File

@@ -552,11 +552,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy ); 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->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc), source->DeviceToLogicalY(ysrc),
xx, xx,
@@ -566,8 +566,8 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 ); gdk_gc_set_clip_origin( m_textGC, 0, 0 );
} }
return TRUE; return TRUE;
@@ -584,11 +584,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy ); 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->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc), source->DeviceToLogicalY(ysrc),
xx, xx,
@@ -598,15 +598,15 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 ); gdk_gc_set_clip_origin( m_textGC, 0, 0 );
} }
return TRUE; return TRUE;
} }
} }
gdk_window_copy_area ( m_window, m_penGC, gdk_window_copy_area ( m_window, m_textGC,
XLOG2DEV(xdest), YLOG2DEV(ydest), XLOG2DEV(xdest), YLOG2DEV(ydest),
csrc->GetWindow(), csrc->GetWindow(),
source->DeviceToLogicalX(xsrc), source->DeviceToLogicalX(xsrc),
@@ -615,7 +615,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
source->DeviceToLogicalYRel(height) ); source->DeviceToLogicalYRel(height) );
/* /*
gdk_window_copy_area ( m_window, m_penGC, gdk_window_copy_area ( m_window, m_textGC,
XLOG2DEV(xdest), YLOG2DEV(ydest), XLOG2DEV(xdest), YLOG2DEV(ydest),
csrc->GetWindow(), csrc->GetWindow(),
xsrc, ysrc, xsrc, ysrc,

4
src/gtk/mdi.cpp
View File

@@ -358,7 +358,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); 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(); PostCreation();

24
src/gtk1/dcclient.cpp
View File

@@ -552,11 +552,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy ); 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->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc), source->DeviceToLogicalY(ysrc),
xx, xx,
@@ -566,8 +566,8 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 ); gdk_gc_set_clip_origin( m_textGC, 0, 0 );
} }
return TRUE; return TRUE;
@@ -584,11 +584,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy ); 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->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc), source->DeviceToLogicalY(ysrc),
xx, xx,
@@ -598,15 +598,15 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
if (useMask && mask) if (useMask && mask)
{ {
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 ); gdk_gc_set_clip_origin( m_textGC, 0, 0 );
} }
return TRUE; return TRUE;
} }
} }
gdk_window_copy_area ( m_window, m_penGC, gdk_window_copy_area ( m_window, m_textGC,
XLOG2DEV(xdest), YLOG2DEV(ydest), XLOG2DEV(xdest), YLOG2DEV(ydest),
csrc->GetWindow(), csrc->GetWindow(),
source->DeviceToLogicalX(xsrc), source->DeviceToLogicalX(xsrc),
@@ -615,7 +615,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
source->DeviceToLogicalYRel(height) ); source->DeviceToLogicalYRel(height) );
/* /*
gdk_window_copy_area ( m_window, m_penGC, gdk_window_copy_area ( m_window, m_textGC,
XLOG2DEV(xdest), YLOG2DEV(ydest), XLOG2DEV(xdest), YLOG2DEV(ydest),
csrc->GetWindow(), csrc->GetWindow(),
xsrc, ysrc, xsrc, ysrc,

4
src/gtk1/mdi.cpp
View File

@@ -358,7 +358,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); 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(); PostCreation();