X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0180d5daae8187ca9d938a1aa07e54ac16a12d1a..e7003166c3bf8f8cbca313addc9d07fa7c21f484:/src/gtk1/bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 7ae387a2f5..f92b146377 100644
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -2,9 +2,8 @@
 // Name:        bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,11 +12,11 @@
 #endif
 
 #include "wx/bitmap.h"
+#include "wx/icon.h"
+#include "wx/filefn.h"
 #include "gdk/gdkprivate.h"
-
-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include "gdk/gdkx.h"
+#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -27,85 +26,68 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 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), int WXUNUSED(paletteIndex) )
 {
-};
+}
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 {
-};
+}
 
 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 );
-#endif  
-};
+    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+}
 
 GdkBitmap *wxMask::GetBitmap(void) const
 {
-  return m_bitmap;
-};
+    return m_bitmap;
+}
   
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-// CMB 20/5/98: added m_bitmap for GdkBitmaps
 class wxBitmapRefData: public wxObjectRefData
 {
-  public:
+public:
+  wxBitmapRefData(void);
+  ~wxBitmapRefData(void);
   
-    wxBitmapRefData(void);
-    ~wxBitmapRefData(void);
-  
-    GdkPixmap      *m_pixmap;
-    GdkBitmap      *m_bitmap;
-    wxMask         *m_mask;
-    int             m_width;
-    int             m_height;
-    int             m_bpp;
-#ifdef USE_GDK_IMLIB
-    GdkImlibImage  *m_image;
-#endif
-    wxPalette      *m_palette;
+  GdkPixmap      *m_pixmap;
+  GdkBitmap      *m_bitmap;
+  wxMask         *m_mask;
+  int             m_width;
+  int             m_height;
+  int             m_bpp;
+  wxPalette      *m_palette;
 };
 
 wxBitmapRefData::wxBitmapRefData(void)
 {
-  m_pixmap = NULL;
-  m_bitmap = NULL;
-  m_mask = NULL;
-  m_width = 0;
-  m_height = 0;
-  m_bpp = 0;
-  m_palette = NULL;
-#ifdef USE_GDK_IMLIB
-  m_image = NULL;
-#endif
-};
+    m_pixmap = (GdkPixmap *) NULL;
+    m_bitmap = (GdkBitmap *) NULL;
+    m_mask = (wxMask *) NULL;
+    m_width = 0;
+    m_height = 0;
+    m_bpp = 0;
+    m_palette = (wxPalette *) NULL;
+}
 
 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 );
-#endif
-  if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-  if (m_mask) delete m_mask;
-  if (m_palette) delete m_palette;
-};
+    if (m_pixmap) gdk_pixmap_unref( m_pixmap );
+    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+    if (m_mask) delete m_mask;
+    if (m_palette) delete m_palette;
+}
 
 //-----------------------------------------------------------------------------
 
@@ -115,285 +97,530 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
 wxBitmap::wxBitmap(void)
 {
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
   
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
-  m_refData = new wxBitmapRefData();
-  M_BMPDATA->m_mask = NULL;
-  M_BMPDATA->m_pixmap = 
-    gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
-  M_BMPDATA->m_width = width;
-  M_BMPDATA->m_height = height;
-  M_BMPDATA->m_bpp = depth;
+    wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" )
+    wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" )
+
+    m_refData = new wxBitmapRefData();
+  
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+  
+    M_BMPDATA->m_mask = (wxMask *) NULL;
+    M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth );
+    M_BMPDATA->m_width = width;
+    M_BMPDATA->m_height = height;
+    M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
    
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
-wxBitmap::wxBitmap( char **bits )
+wxBitmap::wxBitmap( const char **bits )
 {
-  m_refData = new wxBitmapRefData();
-
-#ifndef USE_GDK_IMLIB
+    wxCHECK_RET( bits != NULL, "invalid bitmap data" )
+  
+    m_refData = new wxBitmapRefData();
 
-  GdkBitmap *mask = NULL;
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
   
-  M_BMPDATA->m_pixmap = 
-    gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
     
-  if (mask)
-  {
-    M_BMPDATA->m_mask = new wxMask();
-    M_BMPDATA->m_mask->m_bitmap = mask;
-  };
+    if (mask)
+    {
+        M_BMPDATA->m_mask = new wxMask();
+        M_BMPDATA->m_mask->m_bitmap = mask;
+    }
+  
+    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 = gdk_window_get_visual( parent )->depth;  // ?
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+  
+wxBitmap::wxBitmap( char **bits )
+{
+    wxCHECK_RET( bits != NULL, "invalid bitmap data" )
   
-#else
+    m_refData = new wxBitmapRefData();
 
-  M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
-  Render();
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
   
-#endif
-				  
-  M_BMPDATA->m_bpp = 24; // ?
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
+    
+    wxCHECK_RET( M_BMPDATA->m_pixmap, "couldn't create pixmap" );
+    
+    if (mask)
+    {
+        M_BMPDATA->m_mask = new wxMask();
+        M_BMPDATA->m_mask->m_bitmap = mask;
+    }
+  
+    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+  
+    M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;  // ?
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
   
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
-  Ref( bmp );
+    Ref( bmp );
    
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
   
 wxBitmap::wxBitmap( const wxBitmap* bmp )
 {
-  if (bmp) Ref( *bmp );
+    if (bmp) Ref( *bmp );
    
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
-  LoadFile( filename, 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();
+    m_refData = new wxBitmapRefData();
 
-  M_BMPDATA->m_mask = NULL;
-  M_BMPDATA->m_bitmap = 
-    gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
-  M_BMPDATA->m_width = width;
-  M_BMPDATA->m_height = height;
-  M_BMPDATA->m_bpp = 1;
+    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_width = width;
+    M_BMPDATA->m_height = height;
+    M_BMPDATA->m_bpp = 1;
 
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    wxCHECK_RET( M_BMPDATA->m_bitmap, "couldn't create bitmap" );
+      
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
   
 wxBitmap::~wxBitmap(void)
 {
-  if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
-};
+    if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
+}
   
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
-  if (*this == bmp) return (*this); 
-  Ref( bmp ); 
-  return *this; 
-};
+    if (*this == bmp) return (*this); 
+    Ref( bmp ); 
+    return *this; 
+}
   
 bool wxBitmap::operator == ( const wxBitmap& bmp )
 {
-  return m_refData == bmp.m_refData; 
-};
+    return m_refData == bmp.m_refData; 
+}
   
 bool wxBitmap::operator != ( const wxBitmap& bmp )
 {
-  return m_refData != bmp.m_refData; 
-};
+    return m_refData != bmp.m_refData; 
+}
   
 bool wxBitmap::Ok(void) const
 {
-  return m_refData != NULL;
-};
+    return (m_refData != NULL);
+}
   
 int wxBitmap::GetHeight(void) const
 {
-  if (!Ok()) return 0;
-  return M_BMPDATA->m_height;
-};
+    wxCHECK_MSG( Ok(), -1, "invalid bitmap" );
+
+    return M_BMPDATA->m_height;
+}
 
 int wxBitmap::GetWidth(void) const
 {
-  if (!Ok()) return 0;
-  return M_BMPDATA->m_width;
-};
+    wxCHECK_MSG( Ok(), -1, "invalid bitmap" );
+  
+    return M_BMPDATA->m_width;
+}
 
 int wxBitmap::GetDepth(void) const
 {
-  if (!Ok()) return 0;
-  return M_BMPDATA->m_bpp;
-};
-
-void wxBitmap::SetHeight( int height )
-{
-  if (!Ok()) return;
-  M_BMPDATA->m_height = height;
-};
-
-void wxBitmap::SetWidth( int width )
-{
-  if (!Ok()) return;
-  M_BMPDATA->m_width = width;
-};
-
-void wxBitmap::SetDepth( int depth )
-{
-  if (!Ok()) return;
-  M_BMPDATA->m_bpp = depth;
-};
+    wxCHECK_MSG( Ok(), -1, "invalid bitmap" );
+  
+    return M_BMPDATA->m_bpp;
+}
 
 wxMask *wxBitmap::GetMask(void) const
 {
-  if (!Ok()) return NULL;
+    wxCHECK_MSG( Ok(), (wxMask *) NULL, "invalid bitmap" );
   
-  return M_BMPDATA->m_mask;
-};
+    return M_BMPDATA->m_mask;
+}
 
 void wxBitmap::SetMask( wxMask *mask )
 {
-  if (!Ok()) return;
+    wxCHECK_RET( Ok(), "invalid bitmap" );
   
-  if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
-  M_BMPDATA->m_mask = mask;
-};
+    if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+  
+    M_BMPDATA->m_mask = mask;
+}
 
-void wxBitmap::Resize( int height, int width )
+bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
-  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 (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
-  if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+    wxCHECK_MSG( Ok(), FALSE, "invalid bitmap" );
   
-  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
-};
+    if (type == wxBITMAP_TYPE_PNG)
+    {
+        wxImage image( *this );
+	if (image.Ok()) return image.SaveFile( name, type );
+    }
+    
+    return FALSE;
+}
 
-bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type), 
-  wxPalette *WXUNUSED(palette) )
+bool wxBitmap::LoadFile( const wxString &name, int type )
 {
-#ifdef USE_GDK_IMLIB
-
-  if (!Ok()) return FALSE;
+    UnRef();
+    
+    if (!wxFileExists(name)) return FALSE;
   
-  if (!M_BMPDATA->m_image) RecreateImage();
+    if (type == wxBITMAP_TYPE_XPM)
+    {
+        m_refData = new wxBitmapRefData();
+	
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
   
-  return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, NULL );
+        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( parent, &mask, NULL, name );
+    
+        if (mask)
+        {
+           M_BMPDATA->m_mask = new wxMask();
+           M_BMPDATA->m_mask->m_bitmap = mask;
+        }
+  
+        gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+        M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; 
+    }
+    else if (type == wxBITMAP_TYPE_PNG)
+    {
+        wxImage image;
+        image.LoadFile( name, type );
+        if (image.Ok()) *this = image.ConvertToBitmap();
+    }
+    else if (type == wxBITMAP_TYPE_BMP)
+    {
+        wxImage image;
+        image.LoadFile( name, type );
+        if (image.Ok()) *this = image.ConvertToBitmap();
+    }
+    else 
+        return FALSE;
+    
+    return TRUE;
+}
+        
+wxPalette *wxBitmap::GetPalette(void) const
+{
+    if (!Ok()) return (wxPalette *) NULL;
+    
+    return M_BMPDATA->m_palette;
+}
 
-#endif
+void wxBitmap::SetHeight( int height )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();
 
-  return FALSE;
-};
+    M_BMPDATA->m_height = height;
+}
 
-bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
+void wxBitmap::SetWidth( int width )
 {
-#ifdef USE_GDK_IMLIB
+    if (!m_refData) m_refData = new wxBitmapRefData();
 
-  UnRef();
-  m_refData = new wxBitmapRefData();
-  
-  M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
+    M_BMPDATA->m_width = width;
+}
 
-  if (!M_BMPDATA->m_image)
-  {
-    UnRef();
-    return FALSE;
-  };
+void wxBitmap::SetDepth( int depth )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();
 
-  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
+    M_BMPDATA->m_bpp = depth;
+}
 
-  return FALSE;
-};
-        
-wxPalette *wxBitmap::GetPalette(void) const
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
-  if (!Ok()) return NULL;
-  return M_BMPDATA->m_palette;
-};
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_pixmap = pixmap;
+}
 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {
-  if (!Ok()) return NULL;
-  return M_BMPDATA->m_pixmap;
-};
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, "invalid bitmap" );
+  
+    return M_BMPDATA->m_pixmap;
+}
   
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
-  if (!Ok()) return NULL;
+    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, "invalid bitmap" );
   
-  return M_BMPDATA->m_bitmap;
-};
+    return M_BMPDATA->m_bitmap;
+}
   
-void wxBitmap::DestroyImage(void)
+//-----------------------------------------------------------------------------
+// wxImage
+//-----------------------------------------------------------------------------
+
+wxBitmap wxImage::ConvertToBitmap() const
 {
-  if (!Ok()) return;
+    wxBitmap bitmap;
+
+    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+
+    int width = GetWidth();
+    int height = GetHeight();
   
-  if (M_BMPDATA->m_image)
-  {
-    gdk_imlib_destroy_image( M_BMPDATA->m_image );
-    M_BMPDATA->m_image = NULL;
-  };
-};
+    bitmap.SetHeight( height );
+    bitmap.SetWidth( width );
+    
+    // Create picture
+  
+    GdkImage *data_image = 
+      gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
+  
+    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
 
-void wxBitmap::RecreateImage(void)
-{
-};
+    // Create mask
+  
+    GdkImage *mask_image = (GdkImage*) NULL;
+  
+    if (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 );
+  
+	wxMask *mask = new wxMask();
+	mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
+	
+	bitmap.SetMask( mask );
+    }
+  
+    // Retrieve depth  
+  
+    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if (bpp < 8) bpp = 8;
+    
+    // Render
+
+    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
+    byte_order b_o = RGB;
+  
+    if (bpp >= 24)
+    {
+        GdkVisual *visual = gdk_visual_get_system();
+        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
+        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
+        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
+        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
+        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
+        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
+    }
+  
+    int r_mask = GetMaskRed();
+    int g_mask = GetMaskGreen();
+    int b_mask = GetMaskBlue();
+  
+    unsigned char* data = 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 (HasMask())
+	    {
+	        if ((r == r_mask) && (b == b_mask) && (g == g_mask))
+	            gdk_image_put_pixel( mask_image, x, y, 1 );
+	        else
+	            gdk_image_put_pixel( mask_image, x, y, 0 );
+	    }
+	
+	    switch (bpp)
+	    {
+	        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 32:
+	        case 24:
+	        {
+	            guint32 pixel = 0;
+	            switch (b_o)
+	            {
+	                case RGB: pixel = (r << 16) | (g << 8) | b; break;
+	                case RBG: pixel = (r << 16) | (b << 8) | g; break;
+	                case BRG: pixel = (b << 16) | (r << 8) | g; break;
+	                case BGR: pixel = (b << 16) | (g << 8) | r; break;
+	                case GRB: pixel = (g << 16) | (r << 8) | b; break;
+	                case GBR: pixel = (g << 16) | (b << 8) | r; break;
+	            }
+	            gdk_image_put_pixel( data_image, x, y, pixel );
+	        }
+	        default: break;
+	    }
+        } // for
+    }  // for
+        
+    // Blit picture
+  
+    GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() );
+  
+    gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+  
+    gdk_image_destroy( data_image );
+    gdk_gc_unref( data_gc );
+  
+    // Blit mask
+  
+    if (HasMask())
+    {
+        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
+  
+        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+  
+        gdk_image_destroy( mask_image );
+        gdk_gc_unref( mask_gc );
+    }
+    
+    return bitmap;
+}
 
-void wxBitmap::Render(void)
+wxImage::wxImage( const wxBitmap &bitmap )
 {
-  if (!Ok()) return;
+    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
   
-#ifdef USE_GDK_IMLIB
-
-  gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
-  M_BMPDATA->m_width = M_BMPDATA->m_image->rgb_width;
-  M_BMPDATA->m_height = M_BMPDATA->m_image->rgb_height;
-  M_BMPDATA->m_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
-  GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
-  if (mask)
-  {
-    M_BMPDATA->m_mask = new wxMask();
-    M_BMPDATA->m_mask->m_bitmap = mask;
-  };
+    GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(), 
+                                         0, 0, 
+					 bitmap.GetWidth(), bitmap.GetHeight() );
+    
+    wxCHECK_RET( gdk_image, "couldn't create image" );
   
-#endif
-};
+    Create( bitmap.GetWidth(), bitmap.GetHeight() );
+    char unsigned *data = GetData();
+    
+    if (!data)
+    {
+        gdk_image_destroy( gdk_image );
+        wxFAIL_MSG( "couldn't create image" );
+	return;
+    }
+    
+    GdkImage *gdk_image_mask = (GdkImage*) NULL;
+    if (bitmap.GetMask())
+    {
+        gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(), 
+	                                0, 0, 
+					bitmap.GetWidth(), bitmap.GetHeight() );
+
+	SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
+    }
+  
+    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+
+    GdkColormap *cmap = gtk_widget_get_default_colormap();
+  
+    long pos = 0;
+    for (int j = 0; j < bitmap.GetHeight(); j++)
+    {
+        for (int i = 0; i < bitmap.GetWidth(); 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 >> 2) & 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;
+            }
+      
+	    if (gdk_image_mask)
+	    {
+	        int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
+	        if (mask_pixel == 0)
+	        {
+                    data[pos] = 16;
+                    data[pos+1] = 16;
+                    data[pos+2] = 16;
+	       }
+	    }
+	
+            pos += 3;
+        }
+    }
+  
+    gdk_image_destroy( gdk_image );
+    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+}
+