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

Allow create of 24-bit bitmap, use Pixbuf when not a 24-bit visual

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-10-18 14:32:56 +00:00
parent 5eda3bcdad
commit 4b230a33c5
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/bitmap.cpp
View File

@@ -280,21 +280,26 @@ bool wxBitmap::Create( int width, int height, int depth )
return false; return false;
} }
const GdkVisual* visual = wxTheApp->GetGdkVisual();
if (depth == 32) if (depth == 32)
{ {
SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32); SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
} else
if (depth == 24)
{
if (visual->depth == depth)
SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
else
SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height), 24);
} }
else else
{ {
if (depth != 1) if (depth != 1)
{ {
const GdkVisual* visual = wxTheApp->GetGdkVisual();
if (depth == -1) if (depth == -1)
depth = visual->depth; depth = visual->depth;
wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth"));
} }
SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth)); SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
} }
@@ -807,6 +812,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
if (M_BMPDATA->m_pixbuf == NULL) if (M_BMPDATA->m_pixbuf == NULL)
{ {
int width = GetWidth(); int width = GetWidth();
int height = GetHeight(); int height = GetHeight();
@@ -816,7 +822,6 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
M_BMPDATA->m_pixbuf = pixbuf; M_BMPDATA->m_pixbuf = pixbuf;
gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL, gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
0, 0, 0, 0, width, height); 0, 0, 0, 0, width, height);
// apply the mask to created pixbuf: // apply the mask to created pixbuf:
if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask) if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
{ {
@@ -896,6 +901,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
void* bits = NULL; void* bits = NULL;
GdkPixbuf *pixbuf = GetPixbuf(); GdkPixbuf *pixbuf = GetPixbuf();
const bool hasAlpha = HasAlpha(); const bool hasAlpha = HasAlpha();
// allow access if bpp is valid and matches existence of alpha // allow access if bpp is valid and matches existence of alpha
if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) ) if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )
{ {