// 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__
#include "wx/bitmap.h"
#include "wx/icon.h"
-#include "gdk/gdkprivate.h"
+#include "wx/filefn.h"
+#include "wx/image.h"
-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include "gdk/gdk.h"
+#include "gdk/gdkprivate.h"
+#include "gdk/gdkx.h"
//-----------------------------------------------------------------------------
// wxMask
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 )
{
+ Create( bitmap, colour );
}
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{
+ Create( bitmap, paletteIndex );
+}
+
+wxMask::wxMask( const wxBitmap& bitmap )
+{
+ Create( bitmap );
+}
+
+wxMask::~wxMask()
+{
+ if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+}
+
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+ const wxColour& WXUNUSED(colour) )
+{
+ if (m_bitmap)
+ {
+ gdk_bitmap_unref( m_bitmap );
+ m_bitmap = (GdkBitmap*) NULL;
+ }
+
+ wxFAIL_MSG( _T("TODO") );
+
+ return FALSE;
}
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+ int WXUNUSED(paletteIndex) )
{
+ if (m_bitmap)
+ {
+ gdk_bitmap_unref( m_bitmap );
+ m_bitmap = (GdkBitmap*) NULL;
+ }
+
+ wxFAIL_MSG( _T("not implemented") );
+
+ return FALSE;
}
-wxMask::~wxMask(void)
+bool wxMask::Create( const wxBitmap& bitmap )
{
-#ifdef USE_GDK_IMLIB
- // do not delete the mask, gdk_imlib does it for you
-#else
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-#endif
+ if (m_bitmap)
+ {
+ gdk_bitmap_unref( m_bitmap );
+ m_bitmap = (GdkBitmap*) NULL;
+ }
+
+ if (!bitmap.Ok()) return FALSE;
+
+ wxCHECK_MSG( bitmap.GetBitmap(), FALSE, _T("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(void) const
+GdkBitmap *wxMask::GetBitmap() const
{
- return m_bitmap;
+ 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 USE_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 USE_GDK_IMLIB
- m_image = (GdkImlibImage *) NULL;
-#endif
+wxBitmapRefData::wxBitmapRefData()
+{
+ m_pixmap = (GdkPixmap *) NULL;
+ m_bitmap = (GdkBitmap *) NULL;
+ m_mask = (wxMask *) NULL;
+ m_width = 0;
+ m_height = 0;
+ m_bpp = 0;
+ m_palette = (wxPalette *) NULL;
}
-wxBitmapRefData::~wxBitmapRefData(void)
+wxBitmapRefData::~wxBitmapRefData()
{
-#ifdef USE_GDK_IMLIB
- if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
- if (m_image) gdk_imlib_kill_image( m_image );
-#else
- if (m_pixmap) gdk_pixmap_unref( m_pixmap );
-#endif
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
- if (m_mask) delete m_mask;
- if (m_palette) delete m_palette;
+ if (m_pixmap) gdk_pixmap_unref( m_pixmap );
+ if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+ if (m_mask) delete m_mask;
+ if (m_palette) delete m_palette;
}
//-----------------------------------------------------------------------------
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), _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_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();
-
-#ifndef USE_GDK_IMLIB
-
- 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);
+ 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 );
+
+ 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, _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);
}
-
-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;
+ 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 )
{
- 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 != NULL;
-}
-
-int wxBitmap::GetHeight(void) const
-{
- if (!Ok()) return 0;
- return M_BMPDATA->m_height;
+ return m_refData != bmp.m_refData;
}
-int wxBitmap::GetWidth(void) const
+bool wxBitmap::Ok() const
{
- if (!Ok()) return 0;
- return M_BMPDATA->m_width;
+ return (m_refData != NULL);
}
-int wxBitmap::GetDepth(void) const
+int wxBitmap::GetHeight() const
{
- if (!Ok()) return 0;
- return M_BMPDATA->m_bpp;
-}
+ wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
-void wxBitmap::SetHeight( int height )
-{
- if (!Ok()) return;
- M_BMPDATA->m_height = height;
+ return M_BMPDATA->m_height;
}
-void wxBitmap::SetWidth( int width )
+int wxBitmap::GetWidth() const
{
- if (!Ok()) return;
- M_BMPDATA->m_width = width;
+ wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+
+ return M_BMPDATA->m_width;
}
-void wxBitmap::SetDepth( int depth )
+int wxBitmap::GetDepth() const
{
- if (!Ok()) return;
- M_BMPDATA->m_bpp = depth;
+ wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+
+ return M_BMPDATA->m_bpp;
}
-wxMask *wxBitmap::GetMask(void) const
+wxMask *wxBitmap::GetMask() const
{
- if (!Ok()) return (wxMask *) NULL;
-
- return M_BMPDATA->m_mask;
+ wxCHECK_MSG( Ok(), (wxMask *) NULL, _T("invalid bitmap") );
+
+ return M_BMPDATA->m_mask;
}
void wxBitmap::SetMask( wxMask *mask )
{
- if (!Ok()) return;
-
- if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
- M_BMPDATA->m_mask = mask;
-}
-
-void wxBitmap::Resize( int height, int width )
-{
- if (!Ok()) return;
-
-#ifdef USE_GDK_IMLIB
-
- if (M_BMPDATA->m_bitmap) return; // not supported for bitmaps
-
- if (!M_BMPDATA->m_image) RecreateImage();
-
- if (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
- if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
-
- GdkImlibImage* image = gdk_imlib_clone_scaled_image( M_BMPDATA->m_image, height, width );
- gdk_imlib_destroy_image( M_BMPDATA->m_image );
- M_BMPDATA->m_image = image;
- M_BMPDATA->m_height = height;
- M_BMPDATA->m_width = width;
-
- Render();
-
-#endif
+ wxCHECK_RET( Ok(), _T("invalid bitmap") );
+
+ if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+
+ M_BMPDATA->m_mask = mask;
}
-bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
- wxPalette *WXUNUSED(palette) )
+bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
{
-#ifdef USE_GDK_IMLIB
+ wxCHECK_MSG( Ok(), FALSE, _T("invalid bitmap") );
- if (!Ok()) return FALSE;
-
- if (!M_BMPDATA->m_image) RecreateImage();
-
- return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, (GdkImlibSaveInfo *) NULL );
+ if (type == wxBITMAP_TYPE_PNG)
+ {
+ wxImage image( *this );
+ if (image.Ok()) return image.SaveFile( name, type );
+ }
-#endif
-
- return FALSE;
+ return FALSE;
}
-bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &name, int type )
{
-#ifdef USE_GDK_IMLIB
+ UnRef();
- UnRef();
- m_refData = new wxBitmapRefData();
-
- M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
+ if (!wxFileExists(name)) return FALSE;
- 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;
-#endif
+ if (type == wxBITMAP_TYPE_XPM)
+ {
+ m_refData = new wxBitmapRefData();
- return FALSE;
+ 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 if (type == wxBITMAP_TYPE_PNG)
+ {
+ wxImage image;
+ image.LoadFile( name, type );
+ if (image.Ok()) *this = image.ConvertToBitmap();
+ }
+ else if (type == wxBITMAP_TYPE_BMP)
+ {
+ wxImage image;
+ image.LoadFile( name, type );
+ if (image.Ok()) *this = image.ConvertToBitmap();
+ }
+ else
+ return FALSE;
+
+ return TRUE;
}
-
-wxPalette *wxBitmap::GetPalette(void) const
+
+wxPalette *wxBitmap::GetPalette() const
{
- if (!Ok()) return (wxPalette *) NULL;
- return M_BMPDATA->m_palette;
+ if (!Ok()) return (wxPalette *) NULL;
+
+ return M_BMPDATA->m_palette;
}
-GdkPixmap *wxBitmap::GetPixmap(void) const
+void wxBitmap::SetHeight( int height )
{
- if (!Ok()) 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()) return (GdkBitmap *) NULL;
-
- return M_BMPDATA->m_bitmap;
+ if (!m_refData) m_refData = new wxBitmapRefData();
+
+ M_BMPDATA->m_width = width;
}
-
-void wxBitmap::DestroyImage(void)
+
+void wxBitmap::SetDepth( int depth )
{
- if (!Ok()) return;
-
- if (M_BMPDATA->m_image)
- {
- gdk_imlib_destroy_image( M_BMPDATA->m_image );
- M_BMPDATA->m_image = (GdkImlibImage *) NULL;
- }
+ if (!m_refData) m_refData = new wxBitmapRefData();
+
+ M_BMPDATA->m_bpp = depth;
}
-void wxBitmap::RecreateImage(void)
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
{
+ if (!m_refData) m_refData = new wxBitmapRefData();
+
+ M_BMPDATA->m_pixmap = pixmap;
}
-void wxBitmap::Render(void)
+GdkPixmap *wxBitmap::GetPixmap() const
{
- if (!Ok()) return;
-
-#ifdef USE_GDK_IMLIB
+ wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, _T("invalid bitmap") );
- 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 );
- 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;
- }
-
-#endif
+ return M_BMPDATA->m_pixmap;
}
+GdkBitmap *wxBitmap::GetBitmap() const
+{
+ wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, _T("invalid bitmap") );
+ return M_BMPDATA->m_bitmap;
+}
projects / wxWidgets.git / blobdiff