X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/650c0aa9180563eece310851973171cfaac83ad8..2399c87ccef4649135075265c2a271860e6df327:/src/gtk/bitmap.cpp?ds=inline diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 0a2cf3fca6..88d5a0d6d8 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -23,6 +23,8 @@ #include "wx/rawbmp.h" +#include "wx/gtk/private/object.h" + #include //----------------------------------------------------------------------------- @@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap ) if (!m_bitmap) return false; - GdkGC *gc = gdk_gc_new( m_bitmap ); + wxGtkObject 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; } @@ -181,12 +182,14 @@ GdkBitmap *wxMask::GetBitmap() const // wxBitmap //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData: public wxGDIRefData { public: wxBitmapRefData(); virtual ~wxBitmapRefData(); + virtual bool IsOk() const { return m_pixmap || m_pixbuf; } + GdkPixmap *m_pixmap; GdkPixbuf *m_pixbuf; wxMask *m_mask; @@ -298,19 +301,18 @@ bool wxBitmap::Create( int width, int height, int 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. @@ -333,7 +335,7 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, // 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); @@ -363,6 +365,8 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, return bmp; } +#if wxUSE_IMAGE + bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { UnRef(); @@ -410,12 +414,11 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) else { SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth)); - GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap); + wxGtkObject 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(); @@ -538,10 +541,9 @@ wxImage wxBitmap::ConvertToImage() const { // 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 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 @@ -593,14 +595,7 @@ wxImage wxBitmap::ConvertToImage() const return image; } -bool wxBitmap::IsOk() const -{ - return (m_refData != NULL) && - ( - M_BMPDATA->m_pixbuf || - M_BMPDATA->m_pixmap - ); -} +#endif // wxUSE_IMAGE int wxBitmap::GetHeight() const { @@ -668,9 +663,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const else { ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp); - GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); + wxGtkObject 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()) @@ -678,9 +672,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const 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 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 ); } @@ -692,9 +685,16 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett { wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); +#if wxUSE_IMAGE // Try to save the bitmap via wxImage handlers: wxImage image = ConvertToImage(); return image.Ok() && image.SaveFile(name, type); +#else // !wxUSE_IMAGE + wxUnusedVar(name); + wxUnusedVar(type); + + return false; +#endif // wxUSE_IMAGE } bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) @@ -712,12 +712,14 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) M_BMPDATA->m_mask->m_bitmap = mask; } } +#if wxUSE_IMAGE else // try if wxImage can load it { wxImage image; if (image.LoadFile(name, type) && image.Ok()) CreateFromImage(image, -1); } +#endif // wxUSE_IMAGE return Ok(); } @@ -786,7 +788,7 @@ GdkPixmap *wxBitmap::GetPixmap() const gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf, &M_BMPDATA->m_pixmap, pmask, - wxIMAGE_ALPHA_THRESHOLD); + 0x80 /* alpha threshold */); } return M_BMPDATA->m_pixmap; @@ -895,9 +897,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) 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 ); @@ -917,12 +917,12 @@ bool wxBitmap::HasAlpha() const gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf); } -wxObjectRefData* wxBitmap::CreateRefData() const +wxGDIRefData* wxBitmap::CreateGDIRefData() const { return new wxBitmapRefData; } -wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const { const wxBitmapRefData* oldRef = wx_static_cast(const wxBitmapRefData*, data); wxBitmapRefData* newRef = new wxBitmapRefData; @@ -935,10 +935,9 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const 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 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) { @@ -949,10 +948,9 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const 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 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 @@ -962,12 +960,6 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const return newRef; } -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) - /* static */ void wxBitmap::InitStandardHandlers() { // TODO: Insert handler based on GdkPixbufs handler later