// 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__
#endif
#include "wx/bitmap.h"
-#include "gdk/gdkprivate.h"
+#include "wx/icon.h"
+#include "wx/filefn.h"
+#include "wx/image.h"
+#include "wx/dcmemory.h"
-#ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
-#endif
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxRootWindow;
//-----------------------------------------------------------------------------
// wxMask
IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
-wxMask::wxMask(void)
+wxMask::wxMask()
{
- m_bitmap = 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), const 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 USE_GDK_IMLIB
- // do not delete the mask, gdk_imlib does it for you
-#else
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-#endif
-};
+ if (m_bitmap)
+ gdk_bitmap_unref( m_bitmap );
+}
-GdkBitmap *wxMask::GetBitmap(void) const
+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;
+ blue = blue & 0xf8;
+ green = green & 0xf8;
+ }
+ if (bpp == 16)
+ {
+ red = red & 0xf8;
+ blue = blue & 0xfc;
+ green = green & 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;
+}
+
+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( wxRootWindow->window, 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);
-
+public:
+ wxBitmapRefData();
+ ~wxBitmapRefData();
+
GdkPixmap *m_pixmap;
GdkBitmap *m_bitmap;
wxMask *m_mask;
wxPalette *m_palette;
};
-wxBitmapRefData::wxBitmapRefData(void)
+wxBitmapRefData::wxBitmapRefData()
{
- m_pixmap = NULL;
- m_bitmap = NULL;
- m_mask = NULL;
- m_width = 0;
- m_height = 0;
- m_bpp = 0;
- m_palette = NULL;
-};
+ 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 );
-#else
- if (m_pixmap) gdk_pixmap_unref( m_pixmap );
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-#endif
- 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;
+}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
-wxBitmap::wxBitmap(void)
+wxBitmap::wxBitmap()
{
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
-
-wxBitmap::wxBitmap( const int width, const int height, const int depth )
-{
- m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = NULL;
- M_BMPDATA->m_pixmap =
- gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
- gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
- M_BMPDATA->m_bpp = depth;
-
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+ if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
-wxBitmap::wxBitmap( char **bits )
+wxBitmap::wxBitmap( int width, int height, int depth )
{
- m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = NULL;
+ Create( width, height, depth );
-#ifndef USE_GDK_IMLIB
- M_BMPDATA->m_pixmap =
- gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
-#else
- M_BMPDATA->m_pixmap = NULL;
- int res = gdk_imlib_data_to_pixmap( bits, &M_BMPDATA->m_pixmap, &mask );
-#endif
-
- 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 = 24; // ?
-
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
-
-wxBitmap::wxBitmap( const wxBitmap& bmp )
+ if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+bool wxBitmap::Create( int width, int height, int depth )
{
- Ref( bmp );
-
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
-
-wxBitmap::wxBitmap( const wxBitmap* bmp )
+ 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_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();
+}
+bool wxBitmap::CreateFromXpm( const char **bits )
{
- if (bmp) 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 wxString &filename, const int type )
+wxBitmap::wxBitmap( const wxBitmap& bmp )
{
- LoadFile( filename, type );
-};
+ Ref( bmp );
-// CMB 15/5/98: add constructor for xbm bitmaps
-wxBitmap::wxBitmap( const char bits[], const int width, const int height, const int WXUNUSED(depth))
+ if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+wxBitmap::wxBitmap( const wxString &filename, int type )
{
- m_refData = new wxBitmapRefData();
+ LoadFile( filename, type );
+
+ if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
+{
+ m_refData = new wxBitmapRefData();
+
+ 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;
- M_BMPDATA->m_mask = NULL;
- M_BMPDATA->m_bitmap =
- gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
- gdk_window_get_size( M_BMPDATA->m_bitmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_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 )
{
- 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;
-};
-
-bool wxBitmap::Ok(void) const
+ return m_refData != bmp.m_refData;
+}
+
+bool wxBitmap::Ok() const
{
- return m_refData != NULL;
-};
-
-int wxBitmap::GetHeight(void) const
+ return (m_refData != NULL);
+}
+
+int wxBitmap::GetHeight() const
{
- if (!Ok()) return 0;
- return M_BMPDATA->m_height;
-};
+ wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
-int wxBitmap::GetWidth(void) const
+ return M_BMPDATA->m_height;
+}
+
+int wxBitmap::GetWidth() const
{
- if (!Ok()) return 0;
- return M_BMPDATA->m_width;
-};
+ wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
-int wxBitmap::GetDepth(void) const
+ return M_BMPDATA->m_width;
+}
+
+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( const int height )
+wxMask *wxBitmap::GetMask() const
{
- if (!Ok()) return;
- M_BMPDATA->m_height = height;
-};
+ wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+
+ return M_BMPDATA->m_mask;
+}
-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetMask( wxMask *mask )
{
- if (!Ok()) return;
- M_BMPDATA->m_width = width;
-};
+ wxCHECK_RET( Ok(), wxT("invalid bitmap") );
-void wxBitmap::SetDepth( const int depth )
+ if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+
+ M_BMPDATA->m_mask = mask;
+}
+
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
+{
+ 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_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_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;
+}
+
+bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
{
- if (!Ok()) return;
- 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()) return NULL;
- return M_BMPDATA->m_mask;
-};
+ UnRef();
-void wxBitmap::SetMask( wxMask *mask )
+ 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;
+}
+
+wxPalette *wxBitmap::GetPalette() const
{
- if (!Ok()) return;
- if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
- M_BMPDATA->m_mask = mask;
-};
+ if (!Ok()) return (wxPalette *) NULL;
-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type),
- wxPalette *WXUNUSED(palette) )
+ return M_BMPDATA->m_palette;
+}
+
+void wxBitmap::SetHeight( int height )
{
- return FALSE;
-};
+ if (!m_refData) m_refData = new wxBitmapRefData();
-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+ M_BMPDATA->m_height = height;
+}
+
+void wxBitmap::SetWidth( int width )
{
-#ifdef USE_GDK_IMLIB
+ if (!m_refData) m_refData = new wxBitmapRefData();
- UnRef();
- m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = NULL;
+ M_BMPDATA->m_width = width;
+}
- GdkBitmap *mask = NULL;
-
- int res = gdk_imlib_load_file_to_pixmap( WXSTRINGCAST name, &M_BMPDATA->m_pixmap, &mask );
+void wxBitmap::SetDepth( int depth )
+{
+ if (!m_refData) m_refData = new wxBitmapRefData();
- if (res != 1)
- {
- UnRef();
- return FALSE;
- };
-
- 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 = 24; // ?
-
- return TRUE;
-#endif
+ M_BMPDATA->m_bpp = depth;
+}
- return FALSE;
-};
-
-wxPalette *wxBitmap::GetPalette(void) const
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
{
- if (!Ok()) return NULL;
- return M_BMPDATA->m_palette;
-};
+ if (!m_refData) m_refData = new wxBitmapRefData();
+
+ M_BMPDATA->m_pixmap = pixmap;
+}
-GdkPixmap *wxBitmap::GetPixmap(void) const
+void wxBitmap::SetBitmap( GdkPixmap *bitmap )
{
- if (!Ok()) return NULL;
- return M_BMPDATA->m_pixmap;
-};
-
-GdkBitmap *wxBitmap::GetBitmap(void) const
+ if (!m_refData) m_refData = new wxBitmapRefData();
+
+ M_BMPDATA->m_bitmap = bitmap;
+}
+
+GdkPixmap *wxBitmap::GetPixmap() const
{
- if (!Ok()) return NULL;
- return M_BMPDATA->m_bitmap;
-};
-
+ 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;
+}
projects / wxWidgets.git / blobdiff