X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e86f2cc84aabc8a58b1984c1ed7fb9475f6abe67..a9e2e6e52b9c2371413597a92ccc4f8352963c32:/src/gtk/bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index b1fe2f76f1..8a2785bbd8 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 <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
@@ -39,26 +41,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 wxMask::wxMask()
 {
-    m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = NULL;
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
-    m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = NULL;
     Create( bitmap, colour );
 }
 
 #if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
-    m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = NULL;
     Create( bitmap, paletteIndex );
 }
 #endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
-    m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = NULL;
     Create( bitmap );
 }
 
@@ -74,7 +76,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);
-        m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = NULL;
     }
 
     const int w = bitmap.GetWidth();
@@ -153,10 +155,10 @@ bool wxMask::Create( const wxBitmap& bitmap )
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);
-        m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = NULL;
     }
 
-    if (!bitmap.Ok()) return false;
+    if (!bitmap.IsOk()) return false;
 
     wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
 
@@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     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;
 }
@@ -202,14 +203,14 @@ public:
 
 wxBitmapRefData::wxBitmapRefData()
 {
-    m_pixmap = (GdkPixmap *) NULL;
-    m_pixbuf = (GdkPixbuf *) NULL;
-    m_mask = (wxMask *) NULL;
+    m_pixmap = NULL;
+    m_pixbuf = NULL;
+    m_mask = NULL;
     m_width = 0;
     m_height = 0;
     m_bpp = 0;
 #if wxUSE_PALETTE
-    m_palette = (wxPalette *) NULL;
+    m_palette = NULL;
 #endif // wxUSE_PALETTE
 }
 
@@ -227,7 +228,7 @@ wxBitmapRefData::~wxBitmapRefData()
 
 //-----------------------------------------------------------------------------
 
-#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData)
+#define M_BMPDATA static_cast<wxBitmapRefData*>(m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
@@ -247,8 +248,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     if (width > 0 && height > 0 && depth == 1)
     {
         SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
-
-        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
     }
 }
 
@@ -257,7 +256,9 @@ wxBitmap::wxBitmap(const char* const* bits)
     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)
+        return;
 
     if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
     {
@@ -279,90 +280,37 @@ bool wxBitmap::Create( int width, int height, int depth )
         return false;
     }
 
+    const GdkVisual* visual = wxTheApp->GetGdkVisual();
+
     if (depth == 32)
     {
         SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
+
+        if (!M_BMPDATA)
+            return false;
+
+        // 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 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);
-
-    const double scale_x = double(newx) / M_BMPDATA->m_width;
-    const double scale_y = double(newy) / M_BMPDATA->m_height;
-
-    // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
-    // back, is faster than scaling pixmap ourselves.
-
-    // use pixbuf if already available,
-    // otherwise create temporary pixbuf from pixmap
-    GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
-    if (pixbuf)
-        g_object_ref(pixbuf);
-    else
-        pixbuf = gdk_pixbuf_get_from_drawable(
-            NULL, M_BMPDATA->m_pixmap, NULL,
-            0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
-
-    // new pixbuf for scaled wxBitmap
-    GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new(
-        GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, width, height);
-
-    // GDK_INTERP_NEAREST is the lowest-quality method for continuous-tone
-    // 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,
-        GDK_INTERP_NEAREST);
-
-    g_object_unref(pixbuf);
-    bmp.SetPixbuf(pixbuf_scaled, M_BMPDATA->m_bpp);
-
-    if (M_BMPDATA->m_mask)
-    {
-        pixbuf = gdk_pixbuf_get_from_drawable(
-            NULL, M_BMPDATA->m_mask->m_bitmap, NULL,
-            0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
-
-        pixbuf_scaled = gdk_pixbuf_new(
-            GDK_COLORSPACE_RGB, false, 8, width, height);
-
-        gdk_pixbuf_scale(
-            pixbuf, pixbuf_scaled,
-            0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
-            GDK_INTERP_NEAREST);
-
-        g_object_unref(pixbuf);
-
-        // use existing functionality to create mask from scaled pixbuf
-        wxBitmap maskbmp;
-        maskbmp.SetPixbuf(pixbuf_scaled);
-        bmp.SetMask(new wxMask(maskbmp, *wxBLACK));
-    }
-    return bmp;
+    return IsOk();
 }
 
 #if wxUSE_IMAGE
@@ -371,7 +319,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();
 
-    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
     wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
@@ -410,16 +358,21 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         }
         SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
         delete[] out;
+
+        if (!M_BMPDATA)     // SetPixmap may have failed
+            return false;
     }
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
-        GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+        if (!M_BMPDATA)
+            return false;
+
+        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();
@@ -460,7 +413,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         SetMask(mask);
         delete[] out;
     }
-    return true;
+    return IsOk();
 }
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
@@ -498,7 +451,7 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 
 wxImage wxBitmap::ConvertToImage() const
 {
-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
 
     const int w = GetWidth();
     const int h = GetHeight();
@@ -542,10 +495,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<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
@@ -601,35 +553,35 @@ wxImage wxBitmap::ConvertToImage() const
 
 int wxBitmap::GetHeight() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {
-    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {
-    wxCHECK_RET( Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );
 
     AllocExclusive();
     delete M_BMPDATA->m_mask;
@@ -639,14 +591,14 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
-    return Ok();
+    return IsOk();
 }
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxBitmap ret;
 
-    wxCHECK_MSG(Ok(), ret, wxT("invalid bitmap"));
+    wxCHECK_MSG(IsOk(), ret, wxT("invalid bitmap"));
     wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
                 rect.x + rect.width <= M_BMPDATA->m_width &&
                 rect.y + rect.height <= M_BMPDATA->m_height,
@@ -657,6 +609,9 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            gdk_pixbuf_get_has_alpha(GetPixbuf()),
                                            8, rect.width, rect.height);
+        if (!pixbuf)
+            return ret;
+
         ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,
@@ -665,9 +620,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<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())
@@ -675,9 +629,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<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 );
     }
@@ -687,7 +640,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
 {
-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
 
 #if wxUSE_IMAGE
     // Try to save the bitmap via wxImage handlers:
@@ -707,8 +660,10 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 
     if (type == wxBITMAP_TYPE_XPM)
     {
-        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkBitmap *mask = NULL;
         SetPixmap(gdk_pixmap_create_from_xpm(wxGetRootWindow()->window, &mask, NULL, name.fn_str()));
+        if (!M_BMPDATA)
+            return false;   // do not set the mask
 
         if (mask)
         {
@@ -725,13 +680,13 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     }
 #endif // wxUSE_IMAGE
 
-    return Ok();
+    return IsOk();
 }
 
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
-    wxCHECK_MSG(Ok(), NULL, wxT("invalid bitmap"));
+    wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap"));
 
     return M_BMPDATA->m_palette;
 }
@@ -762,6 +717,9 @@ void wxBitmap::SetDepth( int depth )
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
+    if (!pixmap)
+        return;
+
     if (!m_refData)
         m_refData = new wxBitmapRefData;
 
@@ -776,7 +734,7 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
-    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
 
     // create the pixmap on the fly if we use Pixbuf representation:
     if (M_BMPDATA->m_pixmap == NULL)
@@ -800,17 +758,18 @@ GdkPixmap *wxBitmap::GetPixmap() const
 
 bool wxBitmap::HasPixmap() const
 {
-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_pixmap != NULL;
 }
 
 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
-    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
 
     if (M_BMPDATA->m_pixbuf == NULL)
     {
+
         int width = GetWidth();
         int height = GetHeight();
 
@@ -820,7 +779,6 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
         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)
         {
@@ -856,13 +814,16 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
 
 bool wxBitmap::HasPixbuf() const
 {
-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_pixbuf != NULL;
 }
 
 void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
 {
+    if (!pixbuf)
+        return;
+
     if (!m_refData)
         m_refData = new wxBitmapRefData;
 
@@ -895,15 +856,15 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
     }
 }
 
+#ifdef wxHAS_RAW_BITMAP
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
     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 );
@@ -916,6 +877,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }
+#endif // wxHAS_RAW_BITMAP
 
 bool wxBitmap::HasAlpha() const
 {
@@ -930,7 +892,7 @@ wxGDIRefData* wxBitmap::CreateGDIRefData() const
 
 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;
@@ -941,10 +903,9 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* 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<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)
     {
@@ -955,10 +916,9 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* 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<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