Made dnd reentrent safe as per stable tree.

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 24abc0cbc40d451cc7f91572cb628c35bf936957..ed3595f860625abc7f11e21d5f06230730e69c61 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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


@@ -14,8 +14,27 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"

-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.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);
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxRootWindow;

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


@@ -23,33 +42,166 @@
 
 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;
 {
     m_bitmap = (GdkBitmap *) NULL;

+    Create( bitmap, colour );

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

+    if (m_bitmap)
+        gdk_bitmap_unref( m_bitmap );

 }
 
 }
 

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

 {
 {

-    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+    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;

 }
 
 }
 

-GdkBitmap *wxMask::GetBitmap(void) const
+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;
+}
+
+bool wxMask::Create( const wxBitmap& bitmap )
+{
+    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() const

 {
     return m_bitmap;
 }
 {
     return m_bitmap;
 }

-  
+

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


@@ -57,19 +209,19 @@ GdkBitmap *wxMask::GetBitmap(void) const
 class wxBitmapRefData: public wxObjectRefData
 {
 public:
 class wxBitmapRefData: public wxObjectRefData
 {
 public:

-  wxBitmapRefData(void);
-  ~wxBitmapRefData(void);
-  
-  GdkPixmap      *m_pixmap;
-  GdkBitmap      *m_bitmap;
-  wxMask         *m_mask;
-  int             m_width;
-  int             m_height;
-  int             m_bpp;
-  wxPalette      *m_palette;
+    wxBitmapRefData();
+    ~wxBitmapRefData();
+
+    GdkPixmap      *m_pixmap;
+    GdkBitmap      *m_bitmap;
+    wxMask         *m_mask;
+    int             m_width;
+    int             m_height;
+    int             m_bpp;
+    wxPalette      *m_palette;

 };
 
 };
 

-wxBitmapRefData::wxBitmapRefData(void)
+wxBitmapRefData::wxBitmapRefData()

 {
     m_pixmap = (GdkPixmap *) NULL;
     m_bitmap = (GdkBitmap *) NULL;
 {
     m_pixmap = (GdkPixmap *) NULL;
     m_bitmap = (GdkBitmap *) NULL;


@@ -80,7 +232,7 @@ wxBitmapRefData::wxBitmapRefData(void)
     m_palette = (wxPalette *) NULL;
 }
 
     m_palette = (wxPalette *) NULL;
 }
 

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

 {
     if (m_pixmap) gdk_pixmap_unref( m_pixmap );
     if (m_bitmap) gdk_bitmap_unref( m_bitmap );
 {
     if (m_pixmap) gdk_pixmap_unref( m_pixmap );
     if (m_bitmap) gdk_bitmap_unref( m_bitmap );


@@ -94,71 +246,90 @@ 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 )
 {

-    wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" )
-    wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" )
+    Create( width, height, depth );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+bool wxBitmap::Create( int width, int height, int depth )
+{
+    UnRef();
+
+    wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+
+    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_refData = new wxBitmapRefData();

-  
-    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
-  

     M_BMPDATA->m_mask = (wxMask *) NULL;
     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_width = width;
     M_BMPDATA->m_height = height;

-    M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
-   
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-}
+    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;
+    }

 
 

-wxBitmap::wxBitmap( char **bits )
+    return Ok();
+}
+bool wxBitmap::CreateFromXpm( const char **bits )

 {
 {

-    wxCHECK_RET( bits != NULL, "invalid bitmap data" )
-  
+    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_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;

-    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
-  
-    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
-    
+
+    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;
     }
     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;  // ?
-   
+
+    M_BMPDATA->m_bpp = visual->depth;  // ?
+    

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

+
+    return TRUE;

 }
 }

-  
+

 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
     Ref( bmp );
 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 wxString &filename, int type )
 {
     LoadFile( filename, type );
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
     LoadFile( filename, type );

-  
+

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


@@ -167,432 +338,222 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
     m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_mask = (wxMask *) NULL;
     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_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;
 
     M_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_bpp = 1;
 

+    wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+

     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
     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

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

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

 {
 {

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

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

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

 {
 {

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

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

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

 {
 {

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

     return M_BMPDATA->m_bpp;
 }
 
     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") );

 
 

-void wxBitmap::SetWidth( int width )
-{
-    if (!Ok()) return;
-  
-    wxFAIL_MSG( "wxBitmap::SetWidth not implemented" );
-  
-    M_BMPDATA->m_width = width;
+    return M_BMPDATA->m_mask;

 }
 
 }
 

-void wxBitmap::SetDepth( int depth )
+void wxBitmap::SetMask( wxMask *mask )

 {
 {

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

 }
 
 }
 

-wxMask *wxBitmap::GetMask(void) const
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const

 {
 {

-    if (!Ok())
+    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())

     {
     {

-        wxFAIL_MSG( "invalid bitmap" );
-        return (wxMask *) NULL;
+        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 );

     }
     }

-  
-    return M_BMPDATA->m_mask;
-}

 
 

-void wxBitmap::SetMask( wxMask *mask )
-{
-    if (!Ok())
+    if (GetMask())

     {
     {

-        wxFAIL_MSG( "invalid bitmap" );
-        return;
+        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 );

     }
     }

-  
-    if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
-  
-    M_BMPDATA->m_mask = mask;
+
+    return ret;

 }
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
 }
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {

-    if (!Ok())
-    {
-        wxFAIL_MSG( "invalid bitmap" );
-        return FALSE;
-    }
-  
-    if (type == wxBITMAP_TYPE_PNG)
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+
+    // Try to save the bitmap via wxImage handlers:

     {
     {

-        wxImage image = ConvertToImage();
-       if (image.Ok()) return image.SaveFile( name, type );
+        wxImage image( *this );
+        if (image.Ok()) return image.SaveFile( name, type );

     }
     }

-    
+

     return FALSE;
 }
 
 bool wxBitmap::LoadFile( const wxString &name, int type )
 {
     UnRef();
     return FALSE;
 }
 
 bool wxBitmap::LoadFile( const wxString &name, int type )
 {
     UnRef();

-    
+

     if (!wxFileExists(name)) return FALSE;
     if (!wxFileExists(name)) return FALSE;

-  
+
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    

     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();

-       
+

         GdkBitmap *mask = (GdkBitmap*) NULL;
         GdkBitmap *mask = (GdkBitmap*) NULL;

-        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
-  
-        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( parent, &mask, NULL, name );
-    
+
+        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;
         }
         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; 
-    }
-    else if (type == wxBITMAP_TYPE_PNG)
-    {
-        wxImage image;
-        image.LoadFile( name, type );
-        if (image.Ok()) *this = wxBitmap( image );
+        
+        M_BMPDATA->m_bpp = visual->depth;

     }
     }

-    else if (type == wxBITMAP_TYPE_BMP)
+    else // try if wxImage can load it

     {
         wxImage image;
     {
         wxImage image;

-        image.LoadFile( name, type );
-        if (image.Ok()) *this = wxBitmap( image );
+        if (!image.LoadFile( name, type )) return FALSE;
+        if (image.Ok()) *this = image.ConvertToBitmap();
+        else return FALSE;

     }
     }

-    else 
-        return FALSE;
-    
+

     return TRUE;
 }
     return TRUE;
 }

-        
-wxPalette *wxBitmap::GetPalette(void) const
+
+wxPalette *wxBitmap::GetPalette() const

 {
     if (!Ok()) return (wxPalette *) NULL;
 {
     if (!Ok()) return (wxPalette *) NULL;

+

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

-GdkPixmap *wxBitmap::GetPixmap(void) const
+void wxBitmap::SetHeight( int height )

 {
 {

-    if (!Ok())
-    {
-        wxFAIL_MSG( "invalid bitmap" );
-        return (GdkPixmap *) NULL;
-    }
-  
-    return M_BMPDATA->m_pixmap;
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_height = height;

 }
 }

-  
-GdkBitmap *wxBitmap::GetBitmap(void) const
+
+void wxBitmap::SetWidth( int width )

 {
 {

-    if (!Ok())
-    {
-      wxFAIL_MSG( "invalid bitmap" );
-      return (GdkBitmap *) NULL;
-    }
-  
-    return M_BMPDATA->m_bitmap;
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_width = width;

 }
 }

-  
-wxBitmap::wxBitmap( const wxImage &image )
+
+void wxBitmap::SetDepth( int depth )

 {
 {

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-  
-    if (!image.Ok()) return;
+    if (!m_refData) m_refData = new wxBitmapRefData();

 
 

-    m_refData = new wxBitmapRefData();
+    M_BMPDATA->m_bpp = depth;
+}

 
 

-    M_BMPDATA->m_height = image.GetHeight();
-    M_BMPDATA->m_width = image.GetWidth();
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-  
-    // 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 );
-
-    // Create 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->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
-
-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
-  
-    if (render_depth >= 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 = 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 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( 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 );
-    }
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_pixmap = pixmap;

 }
 
 }
 

-wxImage wxBitmap::ConvertToImage() const
+void wxBitmap::SetBitmap( GdkPixmap *bitmap )

 {
 {

-    wxImage image;
+    if (!m_refData) m_refData = new wxBitmapRefData();

 
 

-    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();
-
-    GdkVisual *visual = gdk_window_get_visual( M_BMPDATA->m_pixmap );
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-  
-    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 >> 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;
-            }
-      
-            pos += 3;
-        }
-    }
-  
-    gdk_image_destroy( gdk_image );
-  
-    return image;
+    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;
+}