X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..8a0681f9338345d0ef32b2ad809d49fd20861119:/src/gtk1/bitmap.cpp diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 07519ea19f..59428e9024 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -2,10 +2,9 @@ // Name: bitmap.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 // 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__ @@ -14,16 +13,12 @@ #include "wx/bitmap.h" #include "wx/icon.h" -#include "gdk/gdkprivate.h" +#include "wx/filefn.h" +#include "wx/image.h" -#ifdef wxUSE_GDK_IMLIB - -#include "../gdk_imlib/gdk_imlib.h" -#include "gdk/gdkx.h" // GDK_DISPLAY -#include -#include - -#endif +#include +#include +#include //----------------------------------------------------------------------------- // wxMask @@ -31,86 +26,184 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject) -wxMask::wxMask(void) +wxMask::wxMask() { - m_bitmap = (GdkBitmap *) NULL; + m_bitmap = (GdkBitmap *) NULL; } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) ) +wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { + m_bitmap = (GdkBitmap *) NULL; + Create( bitmap, colour ); } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) ) +wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) { + m_bitmap = (GdkBitmap *) NULL; + Create( bitmap, paletteIndex ); } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) ) +wxMask::wxMask( const wxBitmap& bitmap ) { + m_bitmap = (GdkBitmap *) NULL; + Create( bitmap ); } -wxMask::~wxMask(void) +wxMask::~wxMask() { -#ifdef wxUSE_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 ); +} + +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; + + GdkVisual *visual = gdk_visual_get_system(); + + GdkImage *mask_image = gdk_image_new( GDK_IMAGE_FASTEST, visual, image.GetWidth(), image.GetHeight() ); + if (!mask_image) return FALSE; + + GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + m_bitmap = gdk_pixmap_new( parent, image.GetWidth(), image.GetHeight(), 1 ); + + + unsigned char *data = image.GetData(); + int index = 0; + + unsigned char red = colour.Red(); + unsigned char green = colour.Green(); + unsigned char blue = colour.Blue(); + + int bpp = visual->depth; + if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + if (bpp == 15) + { + red = red & 0xf8; + blue = blue & 0xf8; + green = green & 0xf8; + } + if (bpp == 16) + { + red = red & 0xf8; + blue = blue & 0xfc; + green = green & 0xf8; + } + + for (int j = 0; j < image.GetHeight(); j++) + for (int i = 0; i < image.GetWidth(); i++) + { + if ((data[index] == red) && + (data[index+1] == green) && + (data[index+2] == blue)) + { + gdk_image_put_pixel( mask_image, i, j, 1 ); + } + else + { + gdk_image_put_pixel( mask_image, i, j, 1 ); + } + index += 3; + } + + GdkGC *mask_gc = gdk_gc_new( m_bitmap ); + + gdk_draw_image( m_bitmap, mask_gc, mask_image, 0, 0, 0, 0, image.GetWidth(), image.GetHeight() ); + + gdk_gc_unref( mask_gc ); + gdk_image_destroy( mask_image ); + + return FALSE; } -GdkBitmap *wxMask::GetBitmap(void) const +bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), + int WXUNUSED(paletteIndex) ) { - return m_bitmap; + 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( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 ); + + if (!m_bitmap) return FALSE; + + GdkGC *gc = gdk_gc_new( m_bitmap ); + + gdk_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; +} + //----------------------------------------------------------------------------- // wxBitmap //----------------------------------------------------------------------------- -// CMB 20/5/98: added m_bitmap for GdkBitmaps 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; -#ifdef wxUSE_GDK_IMLIB - GdkImlibImage *m_image; -#endif - wxPalette *m_palette; +public: + 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) -{ - 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 wxUSE_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 wxUSE_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,441 +212,274 @@ wxBitmapRefData::~wxBitmapRefData(void) 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 ) { - 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); + wxCHECK_RET( (width > 0) && (height > 0), wxT("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), 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( 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); } -wxBitmap::wxBitmap( char **bits ) +wxBitmap::wxBitmap( const char **bits ) { - m_refData = new wxBitmapRefData(); + wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") ) -#ifndef wxUSE_GDK_IMLIB + m_refData = new wxBitmapRefData(); - 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); + 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 ); + + 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 ) + +wxBitmap::wxBitmap( char **bits ) { - Ref( bmp ); - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + wxCHECK_RET( bits != NULL, wxT("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, 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 = gdk_window_get_visual( parent )->depth; // ? + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } - -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 ) { - 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)) { - 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( (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, 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 ) { - 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 + +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; - } - - 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()) - { - wxFAIL_MSG( "invalid bitmap" ); - return -1; - } - - 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 ) +bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) ) { - if (!Ok()) return; - - wxFAIL_MSG( "wxBitmap::SetDepth not implemented" ); - - M_BMPDATA->m_bpp = depth; + 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; } -wxMask *wxBitmap::GetMask(void) const +bool wxBitmap::LoadFile( const wxString &name, int type ) { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return (wxMask *) NULL; - } - - return M_BMPDATA->m_mask; + UnRef(); + + if (!wxFileExists(name)) return FALSE; + + if (type == wxBITMAP_TYPE_XPM) + { + m_refData = new wxBitmapRefData(); + + GdkBitmap *mask = (GdkBitmap*) NULL; + GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + + 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; + } + + 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 // 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; } -void wxBitmap::SetMask( wxMask *mask ) +wxPalette *wxBitmap::GetPalette() const { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - 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()) - { - wxFAIL_MSG( "invalid bitmap" ); - return; - } - -#ifdef wxUSE_GDK_IMLIB - - if (M_BMPDATA->m_bitmap) - { - wxFAIL_MSG( "wxBitmap::Resize not supported for mono-bitmaps" ); - return; - } - - 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 + if (!Ok()) return (wxPalette *) NULL; + + return M_BMPDATA->m_palette; } -bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type), - wxPalette *WXUNUSED(palette) ) +void wxBitmap::SetHeight( int height ) { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return FALSE; - } - -#ifdef wxUSE_GDK_IMLIB + if (!m_refData) m_refData = new wxBitmapRefData(); - if (M_BMPDATA->m_bitmap) - { - wxFAIL_MSG( "wxBitmap::SaveFile not supported for mono-bitmaps" ); - return FALSE; - } - - if (!M_BMPDATA->m_image) RecreateImage(); - - return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, (GdkImlibSaveInfo *) NULL ); - -#else - - wxFAIL_MSG( "wxBitmap::SaveFile not implemented without GdkImlib" ); - -#endif + M_BMPDATA->m_height = height; +} - return FALSE; +void wxBitmap::SetWidth( int width ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); + + M_BMPDATA->m_width = width; } -bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) ) +void wxBitmap::SetDepth( int depth ) { -#ifdef wxUSE_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_bpp = depth; +} - 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::SetPixmap( GdkPixmap *pixmap ) +{ + if (!m_refData) m_refData = new wxBitmapRefData(); - return FALSE; -} - -wxPalette *wxBitmap::GetPalette(void) const -{ - if (!Ok()) return (wxPalette *) NULL; - return M_BMPDATA->m_palette; -} - -GdkPixmap *wxBitmap::GetPixmap(void) const -{ - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return (GdkPixmap *) NULL; - } - -// if (!M_BMPDATA->m_image) RecreateImage(); - - return M_BMPDATA->m_pixmap; -} - -GdkBitmap *wxBitmap::GetBitmap(void) const -{ - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return (GdkBitmap *) NULL; - } - - return M_BMPDATA->m_bitmap; -} - -void wxBitmap::DestroyImage(void) -{ - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - 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()) - { - wxFAIL_MSG( "invalid bitmap" ); - return; - } - -#ifdef wxUSE_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 + M_BMPDATA->m_pixmap = pixmap; } -void wxBitmap::Render(void) -{ - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return; - } - -#ifdef wxUSE_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 +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; +}