Corrected bug in DoSetSize() (wxALLOW_MINUS_ONE)

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 011930fbd104ce7438a7eaa3d9e59b2830ff69ad..80ecdcddac6ceacd6b699c80cb13e81cf796a716 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/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,6 +14,9 @@
 #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 "wx/image.h"
+
+#include "gdk/gdk.h"

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


@@ -23,7 +26,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 

-wxMask::wxMask(void)
+wxMask::wxMask()

 {
     m_bitmap = (GdkBitmap *) NULL;
 }
 {
     m_bitmap = (GdkBitmap *) NULL;
 }


@@ -40,7 +43,7 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 {
 }
 
 {
 }
 

-wxMask::~wxMask(void)
+wxMask::~wxMask()

 {
     if (m_bitmap) gdk_bitmap_unref( m_bitmap );
 }
 {
     if (m_bitmap) gdk_bitmap_unref( m_bitmap );
 }


@@ -49,7 +52,7 @@ GdkBitmap *wxMask::GetBitmap(void) const
 {
     return m_bitmap;
 }
 {
     return m_bitmap;
 }

-  
+

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


@@ -59,7 +62,7 @@ class wxBitmapRefData: public wxObjectRefData
 public:
   wxBitmapRefData(void);
   ~wxBitmapRefData(void);
 public:
   wxBitmapRefData(void);
   ~wxBitmapRefData(void);

-  
+

   GdkPixmap      *m_pixmap;
   GdkBitmap      *m_bitmap;
   wxMask         *m_mask;
   GdkPixmap      *m_pixmap;
   GdkBitmap      *m_bitmap;
   wxMask         *m_mask;


@@ -69,7 +72,7 @@ public:
   wxPalette      *m_palette;
 };
 
   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 +83,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 +97,98 @@ 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" )
+    wxCHECK_RET( (width > 0) && (height > 0), _T("invalid bitmap size") )
+    
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+    if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
+    
+    wxCHECK_RET( (depth ==  gdk_window_get_visual( parent )->depth) ||
+                 (depth == 1), _T("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 (depth == 1)
+    {
+        M_BMPDATA->m_bitmap = gdk_pixmap_new( parent, width, height, 1 );
+        M_BMPDATA->m_bpp = 1;
+    }
+    else
+    {
+        M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth );
+        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 )

 {
 {

-    wxCHECK_RET( bits != NULL, "invalid bitmap data" )
-  
+    wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+

     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
     GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
     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( 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;  // ?
     M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;  // ?

-   

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

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

 {
 {

-    Ref( bmp );
-   
+    wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+
+    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 );
+
+    wxCHECK_RET( M_BMPDATA->m_pixmap, _T("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);
 }
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }

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

 {
 {

-    if (bmp) Ref( *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 +197,181 @@ 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 = 
+    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;
 
       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;
 

+    wxCHECK_RET( M_BMPDATA->m_bitmap, _T("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 )
 {

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

 }
 }

-  
+

 bool wxBitmap::operator != ( const wxBitmap& bmp )
 {
 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);
 }
 bool wxBitmap::Ok(void) const
 {
     return (m_refData != NULL);
 }

-  
+

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

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

 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth(void) const
 {
 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth(void) const
 {

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

     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth(void) const
 {
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth(void) const
 {

-    if (!Ok())
-    {
-        wxFAIL_MSG( "invalid bitmap" );
-        return -1;
-    }
-  
-    return M_BMPDATA->m_bpp;
-}
-
-void wxBitmap::SetHeight( int height )
-{
-    if (!Ok()) return;
-  
-    wxFAIL_MSG( "wxBitmap::SetHeight not implemented" );
-  
-    M_BMPDATA->m_height = height;
-}
-
-void wxBitmap::SetWidth( int width )
-{
-    if (!Ok()) return;
-  
-    wxFAIL_MSG( "wxBitmap::SetWidth not implemented" );
-  
-    M_BMPDATA->m_width = width;
-}
+    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );

 
 

-void wxBitmap::SetDepth( int depth )
-{
-    if (!Ok()) return;
-  
-    wxFAIL_MSG( "wxBitmap::SetDepth not implemented" );
-  
-    M_BMPDATA->m_bpp = depth;
+    return M_BMPDATA->m_bpp;

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

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

     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {

-    if (!Ok())
-    {
-        wxFAIL_MSG( "invalid bitmap" );
-        return;
-    }
-  
+    wxCHECK_RET( Ok(), _T("invalid bitmap") );
+

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

-  
+

     M_BMPDATA->m_mask = mask;
 }
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
     M_BMPDATA->m_mask = mask;
 }
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {

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

     if (type == wxBITMAP_TYPE_PNG)
     {
     if (type == wxBITMAP_TYPE_PNG)
     {

-        wxImage image = ConvertToImage();
+        wxImage image( *this );

        if (image.Ok()) return image.SaveFile( name, type );
     }
        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;

-  
+

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

-       
+

         GdkBitmap *mask = (GdkBitmap*) NULL;
         GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
         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( parent, &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; 
+        M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;

     }
     else if (type == wxBITMAP_TYPE_PNG)
     {
         wxImage image;
         image.LoadFile( name, type );
     }
     else if (type == wxBITMAP_TYPE_PNG)
     {
         wxImage image;
         image.LoadFile( name, type );

-        if (image.Ok()) *this = wxBitmap( image );
+        if (image.Ok()) *this = image.ConvertToBitmap();

     }
     else if (type == wxBITMAP_TYPE_BMP)
     {
         wxImage image;
         image.LoadFile( name, type );
     }
     else if (type == wxBITMAP_TYPE_BMP)
     {
         wxImage image;
         image.LoadFile( name, type );

-        if (image.Ok()) *this = wxBitmap( image );
+        if (image.Ok()) *this = image.ConvertToBitmap();

     }
     }

-    else 
+    else

         return FALSE;
         return FALSE;

-    
+

     return TRUE;
 }
     return TRUE;
 }

-        
+

 wxPalette *wxBitmap::GetPalette(void) const
 {
     if (!Ok()) return (wxPalette *) NULL;
 wxPalette *wxBitmap::GetPalette(void) const
 {
     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 )
-{
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-  
-    if (!image.Ok()) return;

 
 

-    m_refData = new wxBitmapRefData();
+void wxBitmap::SetDepth( int depth )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();

 
 

-    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, 1 );
-               else
-                   gdk_image_put_pixel( mask_image, x, y, 0 );
-           }
-       
-           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 );
-    }
+    M_BMPDATA->m_bpp = depth;

 }
 
 }
 

-wxImage wxBitmap::ConvertToImage() const
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )

 {
 {

-    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_pixmap = pixmap;

 }
 
 }
 

+GdkPixmap *wxBitmap::GetPixmap(void) const
+{
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, _T("invalid bitmap") );

 
 

+    return M_BMPDATA->m_pixmap;
+}

 
 

+GdkBitmap *wxBitmap::GetBitmap(void) const
+{
+    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, _T("invalid bitmap") );
+
+    return M_BMPDATA->m_bitmap;
+}