Added support for frames without borders (such as for

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 05c3136acc931d021e1589e97e9bc9ede7f71add..4706c2e7d7457c5b2ba7df30138ed0658c09e6f1 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -2,9 +2,8 @@
 // Name:        bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,11 +12,9 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

+#include "wx/icon.h"

 #include "gdk/gdkprivate.h"
 #include "gdk/gdkprivate.h"

-
-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include "gdk/gdkx.h"

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -27,40 +24,35 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 wxMask::wxMask(void)
 {
 
 wxMask::wxMask(void)
 {

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

 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )
 {
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )
 {

-};
+}

 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
 {
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
 {

-};
+}

 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 {
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 {

-};
+}

 
 wxMask::~wxMask(void)
 {
 
 wxMask::~wxMask(void)
 {

-#ifdef USE_GDK_IMLIB
-  // do not delete the mask, gdk_imlib does it for you
-#else

   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
   if (m_bitmap) gdk_bitmap_unref( m_bitmap );

-#endif  
-};
+}

 
 GdkBitmap *wxMask::GetBitmap(void) const
 {
   return m_bitmap;
 
 GdkBitmap *wxMask::GetBitmap(void) const
 {
   return m_bitmap;

-};
+}

   
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 
   
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-// CMB 20/5/98: added m_bitmap for GdkBitmaps

 class wxBitmapRefData: public wxObjectRefData
 {
   public:
 class wxBitmapRefData: public wxObjectRefData
 {
   public:


@@ -74,35 +66,27 @@ class wxBitmapRefData: public wxObjectRefData
     int             m_width;
     int             m_height;
     int             m_bpp;
     int             m_width;
     int             m_height;
     int             m_bpp;

-#ifdef USE_GDK_IMLIB
-    GdkImlibImage  *m_image;
-#endif

     wxPalette      *m_palette;
 };
 
 wxBitmapRefData::wxBitmapRefData(void)
 {
     wxPalette      *m_palette;
 };
 
 wxBitmapRefData::wxBitmapRefData(void)
 {

-  m_pixmap = NULL;
-  m_bitmap = NULL;
-  m_mask = NULL;
+  m_pixmap = (GdkPixmap *) NULL;
+  m_bitmap = (GdkBitmap *) NULL;
+  m_mask = (wxMask *) NULL;

   m_width = 0;
   m_height = 0;
   m_bpp = 0;
   m_width = 0;
   m_height = 0;
   m_bpp = 0;

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

 
 wxBitmapRefData::~wxBitmapRefData(void)
 {
 
 wxBitmapRefData::~wxBitmapRefData(void)
 {

-#ifdef USE_GDK_IMLIB
-  if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
-  if (m_image) gdk_imlib_destroy_image( m_image );
-#else

   if (m_pixmap) gdk_pixmap_unref( m_pixmap );
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );

-#endif

   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
   if (m_mask) delete m_mask;
   if (m_palette) delete m_palette;
   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
   if (m_mask) delete m_mask;
   if (m_palette) delete m_palette;

-};
+}

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -113,26 +97,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 wxBitmap::wxBitmap(void)
 {
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 wxBitmap::wxBitmap(void)
 {
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

-};
+}

   
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
   m_refData = new wxBitmapRefData();
   
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
   m_refData = new wxBitmapRefData();

-  M_BMPDATA->m_mask = NULL;
+  M_BMPDATA->m_mask = (wxMask *) NULL;

   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );

-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+  M_BMPDATA->m_width = width;
+  M_BMPDATA->m_height = height;

   M_BMPDATA->m_bpp = depth;
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   M_BMPDATA->m_bpp = depth;
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

-};
+}

 
 wxBitmap::wxBitmap( char **bits )
 {
   m_refData = new wxBitmapRefData();
 
 
 wxBitmap::wxBitmap( char **bits )
 {
   m_refData = new wxBitmapRefData();
 

-#ifndef USE_GDK_IMLIB
-

   GdkBitmap *mask = NULL;
   
   M_BMPDATA->m_pixmap = 
   GdkBitmap *mask = NULL;
   
   M_BMPDATA->m_pixmap = 


@@ -142,49 +125,45 @@ wxBitmap::wxBitmap( char **bits )
   {
     M_BMPDATA->m_mask = new wxMask();
     M_BMPDATA->m_mask->m_bitmap = mask;
   {
     M_BMPDATA->m_mask = new wxMask();
     M_BMPDATA->m_mask->m_bitmap = mask;

-  };
+  }

   
   

-#else
-
-  M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
-  Render();
-  
-#endif
-                                 

   gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
   gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

+  

   M_BMPDATA->m_bpp = 24; // ?
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   M_BMPDATA->m_bpp = 24; // ?
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

-};
+}

   
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
   Ref( bmp );
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
   Ref( bmp );
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

-};
+}

   
 wxBitmap::wxBitmap( const wxBitmap* bmp )
 {
   if (bmp) Ref( *bmp );
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   
 wxBitmap::wxBitmap( const wxBitmap* bmp )
 {
   if (bmp) Ref( *bmp );
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

-};
+}

 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
   LoadFile( filename, type );
 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
   LoadFile( filename, type );

-};
+  
+  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}

 
 

-// CMB 15/5/98: add constructor for xbm bitmaps

 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {
   m_refData = new wxBitmapRefData();
 
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {
   m_refData = new wxBitmapRefData();
 

-  M_BMPDATA->m_mask = NULL;
+  M_BMPDATA->m_mask = (wxMask *) NULL;

   M_BMPDATA->m_bitmap = 
     gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
   M_BMPDATA->m_bitmap = 
     gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );

-  gdk_window_get_size( M_BMPDATA->m_bitmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+  M_BMPDATA->m_width = width;
+  M_BMPDATA->m_height = height;

   M_BMPDATA->m_bpp = 1;
 
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   M_BMPDATA->m_bpp = 1;
 
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);


@@ -193,200 +172,359 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
 wxBitmap::~wxBitmap(void)
 {
   if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
 wxBitmap::~wxBitmap(void)
 {
   if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);

-};
+}

   
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
   if (*this == bmp) return (*this); 
   Ref( bmp ); 
   return *this; 
   
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
   if (*this == bmp) return (*this); 
   Ref( bmp ); 
   return *this; 

-};
+}

   
 bool wxBitmap::operator == ( const wxBitmap& bmp )
 {
   return m_refData == bmp.m_refData; 
   
 bool wxBitmap::operator == ( const wxBitmap& bmp )
 {
   return m_refData == bmp.m_refData; 

-};
+}

   
 bool wxBitmap::operator != ( const wxBitmap& bmp )
 {
   return m_refData != bmp.m_refData; 
   
 bool wxBitmap::operator != ( const wxBitmap& bmp )
 {
   return m_refData != bmp.m_refData; 

-};
+}

   
 bool wxBitmap::Ok(void) const
 {
   
 bool wxBitmap::Ok(void) const
 {

-  return m_refData != NULL;
-};
+  return (m_refData != NULL);
+}

   
 int wxBitmap::GetHeight(void) const
 {
   
 int wxBitmap::GetHeight(void) const
 {

-  if (!Ok()) return 0;
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return -1;
+  }
+

   return M_BMPDATA->m_height;
   return M_BMPDATA->m_height;

-};
+}

 
 int wxBitmap::GetWidth(void) const
 {
 
 int wxBitmap::GetWidth(void) const
 {

-  if (!Ok()) return 0;
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return -1;
+  }
+  

   return M_BMPDATA->m_width;
   return M_BMPDATA->m_width;

-};
+}

 
 int wxBitmap::GetDepth(void) const
 {
 
 int wxBitmap::GetDepth(void) const
 {

-  if (!Ok()) return 0;
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return -1;
+  }
+  

   return M_BMPDATA->m_bpp;
   return M_BMPDATA->m_bpp;

-};
+}

 
 void wxBitmap::SetHeight( int height )
 {
   if (!Ok()) return;
 
 void wxBitmap::SetHeight( int height )
 {
   if (!Ok()) return;

+  
+  wxFAIL_MSG( "wxBitmap::SetHeight not implemented" );
+  

   M_BMPDATA->m_height = height;
   M_BMPDATA->m_height = height;

-};
+}

 
 void wxBitmap::SetWidth( int width )
 {
   if (!Ok()) return;
 
 void wxBitmap::SetWidth( int width )
 {
   if (!Ok()) return;

+  
+  wxFAIL_MSG( "wxBitmap::SetWidth not implemented" );
+  

   M_BMPDATA->m_width = width;
   M_BMPDATA->m_width = width;

-};
+}

 
 void wxBitmap::SetDepth( int depth )
 {
   if (!Ok()) return;
 
 void wxBitmap::SetDepth( int depth )
 {
   if (!Ok()) return;

+  
+  wxFAIL_MSG( "wxBitmap::SetDepth not implemented" );
+  

   M_BMPDATA->m_bpp = depth;
   M_BMPDATA->m_bpp = depth;

-};
+}

 
 wxMask *wxBitmap::GetMask(void) const
 {
 
 wxMask *wxBitmap::GetMask(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return (wxMask *) NULL;
+  }

   
   return M_BMPDATA->m_mask;
   
   return M_BMPDATA->m_mask;

-};
+}

 
 void wxBitmap::SetMask( wxMask *mask )
 {
 
 void wxBitmap::SetMask( wxMask *mask )
 {

-  if (!Ok()) return;
-  
-  if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
-  M_BMPDATA->m_mask = mask;
-};
-
-void wxBitmap::Resize( int height, int width )
-{
-  if (!Ok()) return;
-  
-  return;
-  
-#ifdef USE_GDK_IMLIB
-  
-  if (M_BMPDATA->m_bitmap) return;  // not supported for bitmaps
-  
-  if (!M_BMPDATA->m_image) RecreateImage();
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return;
+  }

   
   

-  if (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );

   if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
   
   if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
   

-  GdkImlibImage* image = gdk_imlib_clone_scaled_image( M_BMPDATA->m_image, height, width );
-  gdk_imlib_destroy_image( M_BMPDATA->m_image );
-  M_BMPDATA->m_image = image;
-  M_BMPDATA->m_height = height;
-  M_BMPDATA->m_width = width;
-  
-  Render();
-  
-#endif
-};
+  M_BMPDATA->m_mask = mask;
+}

 
 

-bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type), 
+bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), int WXUNUSED(type), 

   wxPalette *WXUNUSED(palette) )
 {
   wxPalette *WXUNUSED(palette) )
 {

-#ifdef USE_GDK_IMLIB
-
-  if (!Ok()) return FALSE;
-  
-  if (!M_BMPDATA->m_image) RecreateImage();
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return FALSE;
+  }

   
   

-  return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, NULL );
-
-#endif
-

   return FALSE;
   return FALSE;

-};
+}

 
 

-bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &WXUNUSED(name), int WXUNUSED(type) )

 {
 {

-#ifdef USE_GDK_IMLIB
-
-  UnRef();
-  m_refData = new wxBitmapRefData();
-  
-  M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
-
-  if (!M_BMPDATA->m_image)
+  if (!Ok())

   {
   {

-    UnRef();
+    wxFAIL_MSG( "invalid bitmap" );

     return FALSE;
     return FALSE;

-  };
-
-  Render();
-                                 
-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-  M_BMPDATA->m_bpp = 24; // ?
+  }

   
   

-  return TRUE;
-#endif
-

   return FALSE;
   return FALSE;

-};
+}

         
 wxPalette *wxBitmap::GetPalette(void) const
 {
         
 wxPalette *wxBitmap::GetPalette(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok()) return (wxPalette *) NULL;

   return M_BMPDATA->m_palette;
   return M_BMPDATA->m_palette;

-};
+}

 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {
 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return (GdkPixmap *) NULL;
+  }
+  

   return M_BMPDATA->m_pixmap;
   return M_BMPDATA->m_pixmap;

-};
+}

   
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
   
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return (GdkBitmap *) NULL;
+  }

   
   return M_BMPDATA->m_bitmap;
   
   return M_BMPDATA->m_bitmap;

-};
+}

   
   

-void wxBitmap::DestroyImage(void)
+wxBitmap::wxBitmap( const wxImage &image )

 {
 {

-  if (!Ok()) return;
+  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

   
   

-  if (M_BMPDATA->m_image)
-  {
-    gdk_imlib_destroy_image( M_BMPDATA->m_image );
-    M_BMPDATA->m_image = NULL;
-  };
-};
+  if (!image.Ok()) return;

 
 

-void wxBitmap::RecreateImage(void)
-{
-};
+  m_refData = new wxBitmapRefData();

 
 

-void wxBitmap::Render(void)
-{
-  if (!Ok()) return;
+  M_BMPDATA->m_height = image.GetHeight();
+  M_BMPDATA->m_width = image.GetWidth();
+  int width = image.GetWidth();
+  int height = image.GetHeight();

   
   

-#ifdef USE_GDK_IMLIB
+  // Create picture
+  
+  GdkImage *data_image = 
+    gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
+  
+  M_BMPDATA->m_pixmap = 
+    gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 );

 
 

-  gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
+  // Create mask

   
   

-  M_BMPDATA->m_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
-  GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
-  if (mask)
+  GdkImage *mask_image = (GdkImage*) NULL;
+  
+  if (image.HasMask())

   {
   {

+    unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+  
+    mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
+  

     M_BMPDATA->m_mask = new wxMask();
     M_BMPDATA->m_mask = new wxMask();

-    M_BMPDATA->m_mask->m_bitmap = mask;
-  };
+    M_BMPDATA->m_mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
+  }
+  
+  // Retrieve depth  
+  
+  M_BMPDATA->m_bpp = data_image->depth;
+  
+  int render_depth = 8;
+  if (M_BMPDATA->m_bpp > 8) render_depth = M_BMPDATA->m_bpp;
+  
+  // Render
+  
+  int r_mask = image.GetMaskRed();
+  int g_mask = image.GetMaskGreen();
+  int b_mask = image.GetMaskBlue();
+  
+  unsigned char* data = image.GetData();
+  
+  int index = 0;
+  for (int y = 0; y < height; y++)
+    for (int x = 0; x < width; x++)
+      {
+        int r = data[index];
+       index++;
+        int g = data[index];
+       index++;
+        int b = data[index];
+       index++;
+       
+       if (image.HasMask())
+       {
+         if ((r == r_mask) && (b = b_mask) && (g = g_mask))
+           gdk_image_put_pixel( mask_image, x, y, 0 );
+         else
+           gdk_image_put_pixel( mask_image, x, y, 1 );
+       }
+       
+       switch (render_depth)
+       {
+         case 8:
+         {
+           GdkColormap *cmap = gtk_widget_get_default_colormap();
+            GdkColor *colors = cmap->colors;
+            int max = 3 * (65536);
+            int index = -1;
+
+            for (int i = 0; i < cmap->size; i++)
+            {
+              int rdiff = (r << 8) - colors[i].red;
+              int gdiff = (g << 8) - colors[i].green;
+              int bdiff = (b << 8) - colors[i].blue;
+              int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+              if (sum < max) { index = i; max = sum; }
+            }
+           
+           gdk_image_put_pixel( data_image, x, y, index );
+           
+           break;
+         }
+         case 15:
+         {
+           guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
+           gdk_image_put_pixel( data_image, x, y, pixel );
+           break;
+         }
+         case 16:
+         {
+           guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
+           gdk_image_put_pixel( data_image, x, y, pixel );
+           break;
+         }
+         case 24:
+         {
+           break;
+         }
+         case 32:
+         {
+           break;
+         }
+         default: break;
+       }
+      }
+    
+  // Blit picture

   
   

-#endif
-};
+  GdkGC *data_gc = gdk_gc_new( M_BMPDATA->m_pixmap );
+  
+  gdk_draw_image( M_BMPDATA->m_pixmap, data_gc, data_image, 0, 0, 0, 0, width, height );
+  
+  gdk_image_destroy( data_image );
+  gdk_gc_unref( data_gc );
+  
+  // Blit mask
+  
+  if (image.HasMask())
+  {
+    GdkGC *mask_gc = gdk_gc_new( M_BMPDATA->m_mask->m_bitmap );
+  
+    gdk_draw_image( M_BMPDATA->m_mask->m_bitmap, mask_gc, mask_image, 0, 0, 0, 0, width, height );
+  
+    gdk_image_destroy( mask_image );
+    gdk_gc_unref( mask_gc );
+  }
+   
+}
+
+wxImage wxBitmap::ConvertToImage() const
+{
+  wxImage image;
+
+  if (!Ok())
+  {
+    wxFAIL_MSG( "invalid bitmap" );
+    return image;
+  }
+  
+  GdkImage *gdk_image = gdk_image_get( M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height );
+  
+  if (!gdk_image) return image;
+  
+  image.Create( M_BMPDATA->m_width, M_BMPDATA->m_height );
+  char unsigned *data = image.GetData();
+  
+  int bpp = gdk_image->bpp;
+  GdkColormap *cmap = gtk_widget_get_default_colormap();
+  
+  long pos = 0;
+  for (int j = 0; j < M_BMPDATA->m_height; j++)
+  {
+    for (int i = 0; i < M_BMPDATA->m_width; i++)
+    {
+      int pixel = gdk_image_get_pixel( gdk_image, i, j );
+      if (bpp <= 8)
+      {
+        data[pos] = cmap->colors[pixel].red >> 8;
+        data[pos+1] = cmap->colors[pixel].green >> 8;
+        data[pos+2] = cmap->colors[pixel].blue >> 8;
+      } else if (bpp == 15)
+      {
+        data[pos] = (pixel >> 7) & 0xf8;
+        data[pos+1] = (pixel >> 3) & 0xf8;
+        data[pos+2] = (pixel << 3) & 0xf8;
+      } else if (bpp == 16)
+      {
+        data[pos] = (pixel >> 8) & 0xf8;
+        data[pos+1] = (pixel >> 3) & 0xfc;
+        data[pos+2] = (pixel << 3) & 0xf8;
+      } else
+      {
+        data[pos] = (pixel >> 16) & 0xff;
+        data[pos+1] = (pixel >> 8) & 0xff;
+        data[pos+2] = pixel & 0xff;
+      }
+      
+      pos += 3;
+    }
+  }
+  
+  gdk_image_destroy( gdk_image );
+  
+  return image;
+}
+