Fixed wxRichTextCtrl base class

[wxWidgets.git] / src / gtk / bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 466cd688412e378d3c27bcce1366ce6b268cc0f4..8a2785bbd82abe6b8b014477347e22df3473774a 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -41,26 +41,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 wxMask::wxMask()
 {
 
 wxMask::wxMask()
 {

-    m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = NULL;

 }
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
 }
 
 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 )
 {
     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 )
 {
     Create( bitmap, paletteIndex );
 }
 #endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {

-    m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = NULL;

     Create( bitmap );
 }
 
     Create( bitmap );
 }
 


@@ -76,7 +76,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);

-        m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = NULL;

     }
 
     const int w = bitmap.GetWidth();
     }
 
     const int w = bitmap.GetWidth();


@@ -155,10 +155,10 @@ bool wxMask::Create( const wxBitmap& bitmap )
     if (m_bitmap)
     {
         g_object_unref (m_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") );
 
 
     wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
 


@@ -203,14 +203,14 @@ public:
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 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_width = 0;
     m_height = 0;
     m_bpp = 0;
 #if wxUSE_PALETTE

-    m_palette = (wxPalette *) NULL;
+    m_palette = NULL;

 #endif // wxUSE_PALETTE
 }
 
 #endif // wxUSE_PALETTE
 }
 


@@ -248,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));
     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") );

     }
 }
 
     }
 }
 


@@ -259,6 +257,8 @@ wxBitmap::wxBitmap(const char* const* bits)
 
     GdkBitmap* mask = NULL;
     SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits)));
 
     GdkBitmap* mask = NULL;
     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)
     {
 
     if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
     {


@@ -281,12 +281,19 @@ bool wxBitmap::Create( int width, int height, int depth )
     }
 
     const GdkVisual* visual = wxTheApp->GetGdkVisual();
     }
 
     const GdkVisual* visual = wxTheApp->GetGdkVisual();

-    
+

     if (depth == 32)
     {
         SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
     if (depth == 32)
     {
         SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);

-    } else
-    if (depth == 24)
+
+        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));
     {
         if (visual->depth == depth)
             SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));


@@ -303,71 +310,7 @@ bool wxBitmap::Create( int width, int height, int depth )
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
     }
 
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
     }
 

-    return Ok();
-}
-
-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"));
-
-    width = wxMax(width, 1);
-    height = wxMax(height, 1);
-
-    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.
-
-    // 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*scale_x, -clipy*scale_y, 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
 }
 
 #if wxUSE_IMAGE


@@ -376,7 +319,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();
 
 {
     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)
     wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)


@@ -415,10 +358,16 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         }
         SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
         delete[] out;
         }
         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));
     }
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));

+        if (!M_BMPDATA)
+            return false;
+

         wxGtkObject<GdkGC> gc(gdk_gc_new(M_BMPDATA->m_pixmap));
         gdk_draw_rgb_image(
             M_BMPDATA->m_pixmap, gc,
         wxGtkObject<GdkGC> gc(gdk_gc_new(M_BMPDATA->m_pixmap));
         gdk_draw_rgb_image(
             M_BMPDATA->m_pixmap, gc,


@@ -464,7 +413,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         SetMask(mask);
         delete[] out;
     }
         SetMask(mask);
         delete[] out;
     }

-    return true;
+    return IsOk();

 }
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 }
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)


@@ -502,7 +451,7 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 
 wxImage wxBitmap::ConvertToImage() const
 {
 
 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();
 
     const int w = GetWidth();
     const int h = GetHeight();


@@ -604,35 +553,35 @@ wxImage wxBitmap::ConvertToImage() const
 
 int wxBitmap::GetHeight() 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
 {
 
     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
 {
 
     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
 {
 
     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 )
 {
 
     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;
 
     AllocExclusive();
     delete M_BMPDATA->m_mask;


@@ -642,14 +591,14 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;

-    return Ok();
+    return IsOk();

 }
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxBitmap ret;
 
 }
 
 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,
     wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
                 rect.x + rect.width <= M_BMPDATA->m_width &&
                 rect.y + rect.height <= M_BMPDATA->m_height,


@@ -660,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);
         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,
         ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,


@@ -688,7 +640,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) 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:
 
 #if wxUSE_IMAGE
     // Try to save the bitmap via wxImage handlers:


@@ -708,8 +660,10 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 
     if (type == wxBITMAP_TYPE_XPM)
     {
 
     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()));
         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)
         {
 
         if (mask)
         {


@@ -726,13 +680,13 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     }
 #endif // wxUSE_IMAGE
 
     }
 #endif // wxUSE_IMAGE
 

-    return Ok();
+    return IsOk();

 }
 
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
 }
 
 #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;
 }
 
     return M_BMPDATA->m_palette;
 }


@@ -763,6 +717,9 @@ void wxBitmap::SetDepth( int depth )
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {

+    if (!pixmap)
+        return;
+

     if (!m_refData)
         m_refData = new wxBitmapRefData;
 
     if (!m_refData)
         m_refData = new wxBitmapRefData;
 


@@ -777,7 +734,7 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
 
 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)
 
     // create the pixmap on the fly if we use Pixbuf representation:
     if (M_BMPDATA->m_pixmap == NULL)


@@ -801,18 +758,18 @@ GdkPixmap *wxBitmap::GetPixmap() const
 
 bool wxBitmap::HasPixmap() 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
 {
 
     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)
     {
 
     if (M_BMPDATA->m_pixbuf == NULL)
     {

-     
+

         int width = GetWidth();
         int height = GetHeight();
 
         int width = GetWidth();
         int height = GetHeight();
 


@@ -857,13 +814,16 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
 
 bool wxBitmap::HasPixbuf() 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)
 {
 
     return M_BMPDATA->m_pixbuf != NULL;
 }
 
 void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
 {

+    if (!pixbuf)
+        return;
+

     if (!m_refData)
         m_refData = new wxBitmapRefData;
 
     if (!m_refData)
         m_refData = new wxBitmapRefData;
 


@@ -896,12 +856,13 @@ 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();
 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 && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )
     {
     // allow access if bpp is valid and matches existence of alpha
     if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )
     {


@@ -916,6 +877,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }

+#endif // wxHAS_RAW_BITMAP

 
 bool wxBitmap::HasAlpha() const
 {
 
 bool wxBitmap::HasAlpha() const
 {