1. some more tests in console

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index e4adea4dd18fd9f0142adc82326db8fae2af0b86..ed3595f860625abc7f11e21d5f06230730e69c61 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -2,10 +2,9 @@
 // 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
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,16 +13,28 @@
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"

-#include "gdk/gdkprivate.h"
+#include "wx/filefn.h"
+#include "wx/image.h"
+#include "wx/dcmemory.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
+                          GdkGC               *gc,
+                          GdkDrawable  *src,
+                          gint                xsrc,
+                          gint                ysrc,
+                          gint                xdest,
+                          gint                ydest,
+                          gint                width,
+                          gint                height);

 
 

-#ifdef USE_GDK_IMLIB
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------

 
 

-#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk/gdkx.h"        // GDK_DISPLAY
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#endif
+extern GtkWidget *wxRootWindow;

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


@@ -31,86 +42,202 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 

-wxMask::wxMask(void)
+wxMask::wxMask()
+{
+    m_bitmap = (GdkBitmap *) NULL;
+}
+
+wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
+{
+    m_bitmap = (GdkBitmap *) NULL;
+    Create( bitmap, colour );
+}
+
+wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )

 {
 {

-  m_bitmap = (GdkBitmap *) NULL;
+    m_bitmap = (GdkBitmap *) NULL;
+    Create( bitmap, paletteIndex );

 }
 
 }
 

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

 {
 {

+    m_bitmap = (GdkBitmap *) NULL;
+    Create( bitmap );

 }
 
 }
 

-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
+wxMask::~wxMask()

 {
 {

+    if (m_bitmap)
+        gdk_bitmap_unref( m_bitmap );
+}
+
+bool wxMask::Create( const wxBitmap& bitmap,
+                     const wxColour& colour )
+{
+    if (m_bitmap)
+    {
+        gdk_bitmap_unref( m_bitmap );
+        m_bitmap = (GdkBitmap*) NULL;
+    }
+
+    wxImage image( bitmap );
+    if (!image.Ok()) return FALSE;
+
+    m_bitmap = gdk_pixmap_new( wxRootWindow->window, image.GetWidth(), image.GetHeight(), 1 );
+    GdkGC *gc = gdk_gc_new( m_bitmap );
+
+    GdkColor color;
+    color.red = 65000;
+    color.green = 65000;
+    color.blue = 65000;
+    color.pixel = 1;
+    gdk_gc_set_foreground( gc, &color );
+    gdk_gc_set_fill( gc, GDK_SOLID );
+    gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
+
+    unsigned char *data = image.GetData();
+    int index = 0;
+
+    unsigned char red = colour.Red();
+    unsigned char green = colour.Green();
+    unsigned char blue = colour.Blue();
+
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if (bpp == 15)
+    {
+        red = red & 0xf8;
+        green = green & 0xf8;
+        blue = blue & 0xf8;
+    }
+    if (bpp == 16)
+    {
+        red = red & 0xf8;
+        green = green & 0xfc;
+        blue = blue & 0xf8;
+    }
+
+    color.red = 0;
+    color.green = 0;
+    color.blue = 0;
+    color.pixel = 0;
+    gdk_gc_set_foreground( gc, &color );
+
+    for (int j = 0; j < image.GetHeight(); j++)
+    {
+        int start_x = -1;
+        int i;
+        for (i = 0; i < image.GetWidth(); i++)
+        {
+            if ((data[index] == red) &&
+                (data[index+1] == green) &&
+                (data[index+2] == blue))
+            {
+                if (start_x == -1)
+                start_x = i;
+            }
+            else
+            {
+                if (start_x != -1)
+                {
+                    gdk_draw_line( m_bitmap, gc, start_x, j, i-1, j );
+                    start_x = -1;
+                }
+            }
+            index += 3;
+        }
+        if (start_x != -1)
+            gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
+    }
+
+    gdk_gc_unref( gc );
+
+    return TRUE;

 }
 
 }
 

-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+                     int WXUNUSED(paletteIndex) )

 {
 {

+    if (m_bitmap)
+    {
+        gdk_bitmap_unref( m_bitmap );
+        m_bitmap = (GdkBitmap*) NULL;
+    }
+
+    wxFAIL_MSG( wxT("not implemented") );
+
+    return FALSE;

 }
 
 }
 

-wxMask::~wxMask(void)
+bool wxMask::Create( const wxBitmap& bitmap )

 {
 {

-#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 );
+        m_bitmap = (GdkBitmap*) NULL;
+    }
+
+    if (!bitmap.Ok()) return FALSE;
+
+    wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
+
+    m_bitmap = gdk_pixmap_new( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
+
+    if (!m_bitmap) return FALSE;
+
+    GdkGC *gc = gdk_gc_new( m_bitmap );
+
+    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
+
+    gdk_gc_unref( gc );
+
+    return TRUE;

 }
 
 }
 

-GdkBitmap *wxMask::GetBitmap(void) const
+GdkBitmap *wxMask::GetBitmap() const

 {
 {

-  return m_bitmap;
+    return m_bitmap;

 }
 }

-  
+

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

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

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

-  public:
-  
-    wxBitmapRefData(void);
-    ~wxBitmapRefData(void);
-  
+public:
+    wxBitmapRefData();
+    ~wxBitmapRefData();
+

     GdkPixmap      *m_pixmap;
     GdkBitmap      *m_bitmap;
     wxMask         *m_mask;
     int             m_width;
     int             m_height;
     int             m_bpp;
     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;
 };
 
     wxPalette      *m_palette;
 };
 

-wxBitmapRefData::wxBitmapRefData(void)
-{
-  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;
-#ifdef USE_GDK_IMLIB
-  m_image = (GdkImlibImage *) NULL;
-#endif
+wxBitmapRefData::wxBitmapRefData()
+{
+    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)
+wxBitmapRefData::~wxBitmapRefData()

 {
 {

-#ifdef USE_GDK_IMLIB
-  if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
-  if (m_image) gdk_imlib_kill_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;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -119,381 +246,314 @@ wxBitmapRefData::~wxBitmapRefData(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 

-wxBitmap::wxBitmap(void)
+wxBitmap::wxBitmap()

 {
 {

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

 }
 }

-  
+

 wxBitmap::wxBitmap( int width, int height, int depth )
 {
 wxBitmap::wxBitmap( int width, int height, int depth )
 {

-  m_refData = new wxBitmapRefData();
-  M_BMPDATA->m_mask = (wxMask *) 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;
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    Create( width, height, depth );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 }
 

-wxBitmap::wxBitmap( char **bits )
+bool wxBitmap::Create( int width, int height, int depth )

 {
 {

-  m_refData = new wxBitmapRefData();
+    UnRef();

 
 

-#ifndef USE_GDK_IMLIB
+    wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )

 
 

-  GdkBitmap *mask = NULL;
-  
-  M_BMPDATA->m_pixmap = 
-    gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
-    
-  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) );
-  
-#else
-
-  M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
-  Render();
-  
-#endif
-                                 
-  M_BMPDATA->m_bpp = 24; // ?
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+
+    if (depth == -1) depth = visual->depth;
+
+    wxCHECK_MSG( (depth == visual->depth) ||
+                 (depth == 1), FALSE, wxT("invalid bitmap depth") )
+
+    m_refData = new wxBitmapRefData();
+    M_BMPDATA->m_mask = (wxMask *) NULL;
+    M_BMPDATA->m_width = width;
+    M_BMPDATA->m_height = height;
+    if (depth == 1)
+    {
+        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+        M_BMPDATA->m_bpp = 1;
+    }
+    else
+    {
+        M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
+        M_BMPDATA->m_bpp = visual->depth;
+    }
+
+    return Ok();

 }
 }

-  
-wxBitmap::wxBitmap( const wxBitmap& bmp )
+bool wxBitmap::CreateFromXpm( const char **bits )

 {
 {

-  Ref( bmp );
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
+    m_refData = new wxBitmapRefData();
+
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, (gchar **) bits );
+
+    wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("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 = visual->depth;  // ?
+    
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+
+    return TRUE;

 }
 }

-  
-wxBitmap::wxBitmap( const wxBitmap* bmp )
+
+wxBitmap::wxBitmap( const wxBitmap& bmp )

 {
 {

-  if (bmp) Ref( *bmp );
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    Ref( bmp );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

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

-  LoadFile( filename, type );
-  
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    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))
 {
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {

-  m_refData = new wxBitmapRefData();
+    m_refData = new wxBitmapRefData();

 
 

-  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;
+    M_BMPDATA->m_mask = (wxMask *) NULL;
+    M_BMPDATA->m_bitmap =
+      gdk_bitmap_create_from_data( wxRootWindow->window, (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, wxT("couldn't create bitmap") );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 }

-  
-wxBitmap::~wxBitmap(void)
+
+wxBitmap::~wxBitmap()

 {
 {

-  if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
+    if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);

 }
 }

-  
+

 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
 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 )
+
+bool wxBitmap::operator == ( const wxBitmap& bmp ) const

 {
 {

-  return m_refData == bmp.m_refData; 
+    return m_refData == bmp.m_refData;

 }
 }

-  
-bool wxBitmap::operator != ( const wxBitmap& bmp )
+
+bool wxBitmap::operator != ( const wxBitmap& bmp ) const

 {
 {

-  return m_refData != bmp.m_refData; 
+    return m_refData != bmp.m_refData;

 }
 }

-  
-bool wxBitmap::Ok(void) const
+
+bool wxBitmap::Ok() const

 {
 {

-  wxASSERT_MSG( m_refData != NULL, "invalid bitmap" );
-  return (m_refData != NULL);
+    return (m_refData != NULL);

 }
 }

-  
-int wxBitmap::GetHeight(void) const
+
+int wxBitmap::GetHeight() const

 {
 {

-  if (!Ok()) return 0;
-  return M_BMPDATA->m_height;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_height;

 }
 
 }
 

-int wxBitmap::GetWidth(void) const
+int wxBitmap::GetWidth() const

 {
 {

-  if (!Ok()) return 0;
-  return M_BMPDATA->m_width;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_width;

 }
 
 }
 

-int wxBitmap::GetDepth(void) const
+int wxBitmap::GetDepth() const

 {
 {

-  if (!Ok()) return 0;
-  return M_BMPDATA->m_bpp;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_bpp;

 }
 
 }
 

-void wxBitmap::SetHeight( int height )
+wxMask *wxBitmap::GetMask() const

 {
 {

-  if (!Ok()) return;
-  
-  wxFAIL_MSG( "wxBitmap::SetHeight not implemented" );
-  
-  M_BMPDATA->m_height = height;
+    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_mask;

 }
 
 }
 

-void wxBitmap::SetWidth( int width )
+void wxBitmap::SetMask( wxMask *mask )

 {
 {

-  if (!Ok()) return;
-  
-  wxFAIL_MSG( "wxBitmap::SetWidth not implemented" );
-  
-  M_BMPDATA->m_width = width;
+    wxCHECK_RET( Ok(), wxT("invalid bitmap") );
+
+    if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+
+    M_BMPDATA->m_mask = mask;

 }
 
 }
 

-void wxBitmap::SetDepth( int depth )
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const

 {
 {

-  if (!Ok()) return;
-  
-  wxFAIL_MSG( "wxBitmap::SetDepth not implemented" );
-  
-  M_BMPDATA->m_bpp = depth;
+    wxCHECK_MSG( Ok() &&
+                 (rect.x >= 0) && (rect.y >= 0) &&
+                 (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
+                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
+
+    wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+    if (ret.GetPixmap())
+    {
+        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+        gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+        gdk_gc_destroy( gc );
+    }
+    else
+    {
+        GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
+        gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+        gdk_gc_destroy( gc );
+    }
+
+    if (GetMask())
+    {
+        wxMask *mask = new wxMask;
+        mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, rect.width, rect.height, 1 );
+
+        GdkGC *gc = gdk_gc_new( mask->m_bitmap );
+        gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
+        gdk_gc_destroy( gc );
+
+        ret.SetMask( mask );
+    }
+
+    return ret;

 }
 
 }
 

-wxMask *wxBitmap::GetMask(void) const
+bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )

 {
 {

-  if (!Ok()) return (wxMask *) NULL;
-  
-  return M_BMPDATA->m_mask;
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+
+    // Try to save the bitmap via wxImage handlers:
+    {
+        wxImage image( *this );
+        if (image.Ok()) return image.SaveFile( name, type );
+    }
+
+    return FALSE;

 }
 
 }
 

-void wxBitmap::SetMask( wxMask *mask )
+bool wxBitmap::LoadFile( const wxString &name, int type )

 {
 {

-  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;
-  
-#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;
-  
-  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();
-  
-#else
-  
-  wxFAIL_MSG( "wxBitmap::Resize not implemented without GdkImlib" );
-  
-#endif
+    UnRef();
+
+    if (!wxFileExists(name)) return FALSE;
+
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
+    if (type == wxBITMAP_TYPE_XPM)
+    {
+        m_refData = new wxBitmapRefData();
+
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+
+        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() );
+
+        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 = visual->depth;
+    }
+    else // try if wxImage can load it
+    {
+        wxImage image;
+        if (!image.LoadFile( name, type )) return FALSE;
+        if (image.Ok()) *this = image.ConvertToBitmap();
+        else return FALSE;
+    }
+
+    return TRUE;

 }
 
 }
 

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

 {
 {

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

 
 

-  if (!Ok()) return FALSE;
-  
-  if (!M_BMPDATA->m_image) RecreateImage();
-  
-  return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, (GdkImlibSaveInfo *) NULL );
+    return M_BMPDATA->m_palette;
+}

 
 

-#else
-  
-  wxFAIL_MSG( "wxBitmap::SaveFile not implemented without GdkImlib" );
-  
-#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;
-  }
-
-  Render();
-                                 
-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-  M_BMPDATA->m_bpp = 24; // ?
-  
-  return TRUE;
-  
-#else
-  
-  wxFAIL_MSG( "wxBitmap::LoadFile not implemented without GdkImlib" );
-  
-#endif
+void wxBitmap::SetDepth( int depth )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();

 
 

-  return FALSE;
+    M_BMPDATA->m_bpp = depth;

 }
 }

-        
-wxPalette *wxBitmap::GetPalette(void) const
-{
-  if (!Ok()) return (wxPalette *) NULL;
-  return M_BMPDATA->m_palette;
-}
-
-GdkPixmap *wxBitmap::GetPixmap(void) const
-{
-  if (!Ok()) return (GdkPixmap *) NULL;
-  
-//  if (!M_BMPDATA->m_image) RecreateImage();
-  
-  return M_BMPDATA->m_pixmap;
-}
-  
-GdkBitmap *wxBitmap::GetBitmap(void) const
-{
-  if (!Ok()) return (GdkBitmap *) NULL;
-  
-  return M_BMPDATA->m_bitmap;
-}
-  
-void wxBitmap::DestroyImage(void)
-{
-  if (!Ok()) return;
-  
-  if (M_BMPDATA->m_image)
-  {
-    gdk_imlib_destroy_image( M_BMPDATA->m_image );
-    M_BMPDATA->m_image = (GdkImlibImage *) NULL;
-  }
-}
-
-void wxBitmap::RecreateImage(void)
-{
-  if (!Ok()) return;
-  
-#ifdef USE_GDK_IMLIB
-
-  DestroyImage();
-  
-  wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "invalid bitmap" );
-  
-  long size = (long)(M_BMPDATA->m_width)*(long)(M_BMPDATA->m_height)*(long)3;
-  unsigned char *data = new unsigned char[size];
-  for (long i = 0; i < size; i++) data[i] = 100;
-  
-  GdkImage *image = gdk_image_get( M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height );
-  
-  long pos = 0;
-  for (int j = 0; j < M_BMPDATA->m_height; j++)
-  {
-    for (int i = 0; i < M_BMPDATA->m_width; i++)
-    {
-      XColor xcol;
-      xcol.pixel = gdk_image_get_pixel( image, i, j );
-      Colormap cm = ((GdkColormapPrivate*)gdk_imlib_get_colormap())->xcolormap;
-      XQueryColor( gdk_display, cm, &xcol );
-      
-      data[pos] = xcol.red;
-      data[pos+1] = xcol.green;
-      data[pos+2] = xcol.blue;
-      pos += 3;
-    }
-  }
-  
-  wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "invalid bitmap" );
-  
-  M_BMPDATA->m_image = gdk_imlib_create_image_from_data( 
-     data, (unsigned char*)NULL, M_BMPDATA->m_width, M_BMPDATA->m_height );
-  
-  delete[] data;
-  
-  gdk_image_destroy( image );
-  
-  Render();
-  
-#else
-  
-  wxFAIL_MSG( "wxBitmap::RecreateImage not implemented without GdkImlib" );
-  
-#endif
+
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_pixmap = pixmap;

 }
 
 }
 

-void wxBitmap::Render(void)
-{
-  if (!Ok()) return;
-  
-#ifdef USE_GDK_IMLIB
-
-  if (!M_BMPDATA->m_image) RecreateImage();
-  
-  if (M_BMPDATA->m_pixmap)
-  { 
-    gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
-    M_BMPDATA->m_pixmap = (GdkPixmap*) NULL;
-  }
-  if (M_BMPDATA->m_mask)
-  {
-    delete M_BMPDATA->m_mask;
-    M_BMPDATA->m_mask = (wxMask*) NULL;
-  }
-  
-  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 );
-  
-  wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "pixmap rendering failed" ) 
-  
-  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;
-  }
-  
-#else
-  
-  wxFAIL_MSG( "wxBitmap::Render not implemented without GdkImlib" );
-  
-#endif
+void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_bitmap = bitmap;
+}
+
+GdkPixmap *wxBitmap::GetPixmap() const
+{
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_pixmap;

 }
 
 }
 

+GdkBitmap *wxBitmap::GetBitmap() const
+{
+    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );

 
 

+    return M_BMPDATA->m_bitmap;
+}