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

Preventing bitmap crash differently.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-03-29 17:23:54 +00:00
parent c7f6246740
commit 8cce894070
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/bitmap.cpp
View File

@@ -328,8 +328,8 @@ bool wxBitmap::CreateFromXpm( const char **bits )
} }
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = visual->depth; // ? M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ?
return TRUE; return TRUE;
} }

11
src/gtk/dcclient.cpp
View File

@@ -1011,10 +1011,6 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
use_bitmap = bitmap; use_bitmap = bitmap;
} }
#ifdef __WXGTK20__
useMask = FALSE;
#endif
/* apply mask if any */ /* apply mask if any */
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap(); if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
@@ -1022,6 +1018,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
if (useMask && mask) if (useMask && mask)
{ {
GdkBitmap *new_mask = (GdkBitmap*) NULL; GdkBitmap *new_mask = (GdkBitmap*) NULL;
#ifndef __WXGTK20__ // TODO fix crash
if (!m_currentClippingRegion.IsNull()) if (!m_currentClippingRegion.IsNull())
{ {
GdkColor col; GdkColor col;
@@ -1041,7 +1038,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
gdk_gc_unref( gc ); gdk_gc_unref( gc );
} }
#endif
if (is_mono) if (is_mono)
{ {
if (new_mask) if (new_mask)
@@ -1058,6 +1055,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy ); gdk_gc_set_clip_origin( m_penGC, xx, yy );
} }
if (new_mask) if (new_mask)
gdk_bitmap_unref( new_mask ); gdk_bitmap_unref( new_mask );
} }
@@ -1223,6 +1221,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
if (useMask && mask) if (useMask && mask)
{ {
GdkBitmap *new_mask = (GdkBitmap*) NULL; GdkBitmap *new_mask = (GdkBitmap*) NULL;
#ifndef __WXGTK20__ // TODO fix crash
if (!m_currentClippingRegion.IsNull()) if (!m_currentClippingRegion.IsNull())
{ {
GdkColor col; GdkColor col;
@@ -1242,7 +1241,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
gdk_gc_unref( gc ); gdk_gc_unref( gc );
} }
#endif
if (is_mono) if (is_mono)
{ {
if (new_mask) if (new_mask)

4
src/gtk1/bitmap.cpp
View File

@@ -328,8 +328,8 @@ bool wxBitmap::CreateFromXpm( const char **bits )
} }
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = visual->depth; // ? M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ?
return TRUE; return TRUE;
} }

11
src/gtk1/dcclient.cpp
View File

@@ -1011,10 +1011,6 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
use_bitmap = bitmap; use_bitmap = bitmap;
} }
#ifdef __WXGTK20__
useMask = FALSE;
#endif
/* apply mask if any */ /* apply mask if any */
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap(); if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
@@ -1022,6 +1018,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
if (useMask && mask) if (useMask && mask)
{ {
GdkBitmap *new_mask = (GdkBitmap*) NULL; GdkBitmap *new_mask = (GdkBitmap*) NULL;
#ifndef __WXGTK20__ // TODO fix crash
if (!m_currentClippingRegion.IsNull()) if (!m_currentClippingRegion.IsNull())
{ {
GdkColor col; GdkColor col;
@@ -1041,7 +1038,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
gdk_gc_unref( gc ); gdk_gc_unref( gc );
} }
#endif
if (is_mono) if (is_mono)
{ {
if (new_mask) if (new_mask)
@@ -1058,6 +1055,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
gdk_gc_set_clip_mask( m_penGC, mask ); gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy ); gdk_gc_set_clip_origin( m_penGC, xx, yy );
} }
if (new_mask) if (new_mask)
gdk_bitmap_unref( new_mask ); gdk_bitmap_unref( new_mask );
} }
@@ -1223,6 +1221,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
if (useMask && mask) if (useMask && mask)
{ {
GdkBitmap *new_mask = (GdkBitmap*) NULL; GdkBitmap *new_mask = (GdkBitmap*) NULL;
#ifndef __WXGTK20__ // TODO fix crash
if (!m_currentClippingRegion.IsNull()) if (!m_currentClippingRegion.IsNull())
{ {
GdkColor col; GdkColor col;
@@ -1242,7 +1241,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
gdk_gc_unref( gc ); gdk_gc_unref( gc );
} }
#endif
if (is_mono) if (is_mono)
{ {
if (new_mask) if (new_mask)