don't use \u escapes, VC6 doesn't understand them

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 0a2cf3fca6ab90ec57f34217ab16fbd5ceed756e..1be0bb94a42ae9f8909f35cefc3c15906f7a59dc 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -23,6 +23,8 @@
 
 #include "wx/rawbmp.h"
 
 
 #include "wx/rawbmp.h"
 

+#include "wx/gtk/private/object.h"
+

 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------


@@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     if (!m_bitmap) return false;
 
 
     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());
     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;
 }
 
     return true;
 }


@@ -181,12 +182,14 @@ GdkBitmap *wxMask::GetBitmap() const
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData: public wxGDIRefData

 {
 public:
     wxBitmapRefData();
     virtual ~wxBitmapRefData();
 
 {
 public:
     wxBitmapRefData();
     virtual ~wxBitmapRefData();
 

+    virtual bool IsOk() const { return m_pixmap || m_pixbuf; }
+

     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;


@@ -225,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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 


@@ -255,7 +258,7 @@ wxBitmap::wxBitmap(const char* const* bits)
     wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
 
     GdkBitmap* mask = NULL;
     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)
     {
 
     if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
     {


@@ -277,40 +280,47 @@ bool wxBitmap::Create( int width, int height, int depth )
         return false;
     }
 
         return false;
     }
 

+    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);

+        // 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)
         {
     }
     else
     {
         if (depth != 1)
         {

-            const GdkVisual* visual = wxTheApp->GetGdkVisual();

             if (depth == -1)
                 depth = visual->depth;
             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();
 }
 
         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"));
 
 {
     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.
 
     // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
     // back, is faster than scaling pixmap ourselves.


@@ -333,7 +343,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,
     // 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);
         GDK_INTERP_NEAREST);
 
     g_object_unref(pixbuf);


@@ -363,6 +373,8 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
     return bmp;
 }
 
     return bmp;
 }
 

+#if wxUSE_IMAGE
+

 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();


@@ -410,12 +422,11 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
     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);
         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();
     }
 
     const wxByte* alpha = image.GetAlpha();


@@ -538,10 +549,9 @@ wxImage wxBitmap::ConvertToImage() const
         {
             // mono bitmaps are inverted, i.e. 0 is white
             pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
         {
             // 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);
             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
             pixmap = pixmap_invert;
         }
         // create a pixbuf which shares data with the wxImage


@@ -593,14 +603,7 @@ wxImage wxBitmap::ConvertToImage() const
     return image;
 }
 
     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
 {
 
 int wxBitmap::GetHeight() const
 {


@@ -668,9 +671,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     else
     {
         ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
     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 );
         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())
     }
     // make mask, unless there is already alpha
     if (GetMask() && !HasAlpha())


@@ -678,9 +680,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 );
 
         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);
         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 );
     }
 
         ret.SetMask( mask );
     }


@@ -692,9 +693,16 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
 {
     wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
 
 {
     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);
     // 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 )
 }
 
 bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )


@@ -712,12 +720,14 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
             M_BMPDATA->m_mask->m_bitmap = mask;
         }
     }
             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);
     }
     else // try if wxImage can load it
     {
         wxImage image;
         if (image.LoadFile(name, type) && image.Ok())
             CreateFromImage(image, -1);
     }

+#endif // wxUSE_IMAGE

 
     return Ok();
 }
 
     return Ok();
 }


@@ -786,7 +796,7 @@ GdkPixmap *wxBitmap::GetPixmap() const
         gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
                                           &M_BMPDATA->m_pixmap,
                                           pmask,
         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;
     }
 
     return M_BMPDATA->m_pixmap;


@@ -805,6 +815,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
 
     if (M_BMPDATA->m_pixbuf == NULL)
     {
 
     if (M_BMPDATA->m_pixbuf == NULL)
     {

+     

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


@@ -814,7 +825,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);
         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)
         {
         // apply the mask to created pixbuf:
         if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
         {


@@ -894,10 +904,9 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     void* bits = NULL;
     GdkPixbuf *pixbuf = GetPixbuf();
     const bool hasAlpha = HasAlpha();
     void* bits = NULL;
     GdkPixbuf *pixbuf = GetPixbuf();
     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 != 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 );
     {
         data.m_height = gdk_pixbuf_get_height( pixbuf );
         data.m_width = gdk_pixbuf_get_width( pixbuf );


@@ -917,14 +926,14 @@ bool wxBitmap::HasAlpha() const
         gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
 }
 
         gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
 }
 

-wxObjectRefData* wxBitmap::CreateRefData() const
+wxGDIRefData* wxBitmap::CreateGDIRefData() const

 {
     return new wxBitmapRefData;
 }
 
 {
     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);
+    const wxBitmapRefData* oldRef = static_cast<const wxBitmapRefData*>(data);

     wxBitmapRefData* newRef = new wxBitmapRefData;
     newRef->m_width = oldRef->m_width;
     newRef->m_height = oldRef->m_height;
     wxBitmapRefData* newRef = new wxBitmapRefData;
     newRef->m_width = oldRef->m_width;
     newRef->m_height = oldRef->m_height;


@@ -935,10 +944,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));
             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);
         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)
     {
     }
     if (oldRef->m_pixbuf != NULL)
     {


@@ -949,10 +957,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);
         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);
         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
     }
 #if wxUSE_PALETTE
     // implement this if SetPalette is ever implemented


@@ -962,12 +969,6 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
     return newRef;
 }
 
     return newRef;
 }
 

-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
-

 /* static */ void wxBitmap::InitStandardHandlers()
 {
     // TODO: Insert handler based on GdkPixbufs handler later
 /* static */ void wxBitmap::InitStandardHandlers()
 {
     // TODO: Insert handler based on GdkPixbufs handler later