#include "wx/rawbmp.h"
+#include "wx/gtk/private/object.h"
+
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
if (!m_bitmap) return false;
- GdkGC *gc = gdk_gc_new( m_bitmap );
+ wxGtkObject<GdkGC> gc(gdk_gc_new( m_bitmap ));
gdk_gc_set_function(gc, GDK_COPY_INVERT);
gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());
- g_object_unref (gc);
return true;
}
//-----------------------------------------------------------------------------
-#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData)
+#define M_BMPDATA static_cast<wxBitmapRefData*>(m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
GdkBitmap* mask = NULL;
- SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, wx_const_cast(char**, bits)));
+ SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits)));
if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
{
return false;
}
+ const GdkVisual* visual = wxTheApp->GetGdkVisual();
+
if (depth == 32)
{
SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
+ // must initialize alpha, otherwise GetPixmap()
+ // will create a mask out of garbage
+ gdk_pixbuf_fill(M_BMPDATA->m_pixbuf, 0x000000ff);
+ } 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
{
if (depth != 1)
{
- const GdkVisual* visual = wxTheApp->GetGdkVisual();
if (depth == -1)
depth = visual->depth;
-
- wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth"));
}
-
SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
}
return Ok();
}
-wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const
+wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
+ int width, int height) const
{
wxBitmap bmp;
wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
- int width = wxMax(newx, 1);
- int height = wxMax(newy, 1);
- width = wxMin(width, clipwidth);
- height = wxMin(height, clipheight);
+ width = wxMax(width, 1);
+ height = wxMax(height, 1);
- const double scale_x = double(newx) / M_BMPDATA->m_width;
- const double scale_y = double(newy) / M_BMPDATA->m_height;
+ const double scale_x = double(width) / clipwidth;
+ const double scale_y = double(height) / clipheight;
// Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
// back, is faster than scaling pixmap ourselves.
// images, but the only one which preserves sharp edges
gdk_pixbuf_scale(
pixbuf, pixbuf_scaled,
- 0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
+ 0, 0, width, height, -clipx*scale_x, -clipy*scale_y, scale_x, scale_y,
GDK_INTERP_NEAREST);
g_object_unref(pixbuf);
else
{
SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
- GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+ wxGtkObject<GdkGC> gc(gdk_gc_new(M_BMPDATA->m_pixmap));
gdk_draw_rgb_image(
M_BMPDATA->m_pixmap, gc,
0, 0, w, h,
GDK_RGB_DITHER_NONE, image.GetData(), w * 3);
- g_object_unref(gc);
}
const wxByte* alpha = image.GetAlpha();
{
// mono bitmaps are inverted, i.e. 0 is white
pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
- GdkGC* gc = gdk_gc_new(pixmap_invert);
+ wxGtkObject<GdkGC> gc(gdk_gc_new(pixmap_invert));
gdk_gc_set_function(gc, GDK_COPY_INVERT);
gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h);
- g_object_unref(gc);
pixmap = pixmap_invert;
}
// create a pixbuf which shares data with the wxImage
else
{
ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
- GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+ wxGtkObject<GdkGC> gc(gdk_gc_new( ret.GetPixmap() ));
gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
- g_object_unref (gc);
}
// make mask, unless there is already alpha
if (GetMask() && !HasAlpha())
wxMask *mask = new wxMask;
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
- GdkGC *gc = gdk_gc_new( mask->m_bitmap );
+ wxGtkObject<GdkGC> gc(gdk_gc_new( mask->m_bitmap ));
gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);
- g_object_unref (gc);
ret.SetMask( mask );
}
if (M_BMPDATA->m_pixbuf == NULL)
{
+
int width = GetWidth();
int height = GetHeight();
M_BMPDATA->m_pixbuf = pixbuf;
gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
0, 0, 0, 0, width, height);
-
// apply the mask to created pixbuf:
if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
{
void* bits = NULL;
GdkPixbuf *pixbuf = GetPixbuf();
const bool hasAlpha = HasAlpha();
+
// allow access if bpp is valid and matches existence of alpha
- if (pixbuf != NULL && (
- bpp == 24 && !hasAlpha ||
- bpp == 32 && hasAlpha))
+ if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )
{
data.m_height = gdk_pixbuf_get_height( pixbuf );
data.m_width = gdk_pixbuf_get_width( pixbuf );
wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
{
- const wxBitmapRefData* oldRef = wx_static_cast(const wxBitmapRefData*, data);
+ const wxBitmapRefData* oldRef = static_cast<const wxBitmapRefData*>(data);
wxBitmapRefData* newRef = new wxBitmapRefData;
newRef->m_width = oldRef->m_width;
newRef->m_height = oldRef->m_height;
oldRef->m_pixmap, oldRef->m_width, oldRef->m_height,
// use pixmap depth, m_bpp may not match
gdk_drawable_get_depth(oldRef->m_pixmap));
- GdkGC* gc = gdk_gc_new(newRef->m_pixmap);
+ wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_pixmap));
gdk_draw_drawable(
newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);
- g_object_unref(gc);
}
if (oldRef->m_pixbuf != NULL)
{
newRef->m_mask = new wxMask;
newRef->m_mask->m_bitmap = gdk_pixmap_new(
oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1);
- GdkGC* gc = gdk_gc_new(newRef->m_mask->m_bitmap);
+ wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_mask->m_bitmap));
gdk_draw_drawable(newRef->m_mask->m_bitmap,
gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1);
- g_object_unref(gc);
}
#if wxUSE_PALETTE
// implement this if SetPalette is ever implemented
projects / wxWidgets.git / blobdiff