#include "wx/filefn.h"
#include "wx/image.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
//-----------------------------------------------------------------------------
// wxMask
wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
{
+ m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, colour );
}
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{
+ m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, paletteIndex );
}
wxMask::wxMask( const wxBitmap& bitmap )
{
+ m_bitmap = (GdkBitmap *) NULL;
Create( bitmap );
}
wxMask::~wxMask()
{
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+ if (m_bitmap)
+ gdk_bitmap_unref( m_bitmap );
}
-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
- const wxColour& WXUNUSED(colour) )
+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;
- wxFAIL_MSG( _T("TODO") );
-
+ 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;
}
m_bitmap = (GdkBitmap*) NULL;
}
- wxFAIL_MSG( _T("not implemented") );
+ wxFAIL_MSG( wxT("not implemented") );
return FALSE;
}
if (!bitmap.Ok()) return FALSE;
- wxCHECK_MSG( bitmap.GetBitmap(), FALSE, _T("Cannot create mask from colour bitmap") );
+ 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 );
wxBitmap::wxBitmap( int width, int height, int depth )
{
- wxCHECK_RET( (width > 0) && (height > 0), _T("invalid bitmap size") )
+ 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), _T("invalid bitmap depth") )
+ (depth == 1), wxT("invalid bitmap depth") )
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = (wxMask *) NULL;
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
}
-wxBitmap::wxBitmap( const char **bits )
+bool wxBitmap::CreateFromXpm( const char **bits )
{
- wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+ wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
m_refData = new wxBitmapRefData();
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( char **bits )
-{
- 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") );
+ wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
if (mask)
{
M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ?
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+
+ return TRUE;
}
wxBitmap::wxBitmap( const wxBitmap& bmp )
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
- wxCHECK_RET( M_BMPDATA->m_bitmap, _T("couldn't create bitmap") );
+ wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
}
int wxBitmap::GetHeight() const
{
- wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
return M_BMPDATA->m_height;
}
int wxBitmap::GetWidth() const
{
- wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
return M_BMPDATA->m_width;
}
int wxBitmap::GetDepth() const
{
- wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
return M_BMPDATA->m_bpp;
}
wxMask *wxBitmap::GetMask() const
{
- wxCHECK_MSG( Ok(), (wxMask *) NULL, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_mask;
}
void wxBitmap::SetMask( wxMask *mask )
{
- wxCHECK_RET( Ok(), _T("invalid bitmap") );
+ wxCHECK_RET( Ok(), wxT("invalid bitmap") );
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
- if (type == wxBITMAP_TYPE_PNG)
+ // Try to save the bitmap via wxImage handlers:
{
wxImage image( *this );
if (image.Ok()) return image.SaveFile( name, type );
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)
+ else // try if wxImage can load it
{
wxImage image;
- image.LoadFile( name, type );
+ if (!image.LoadFile( name, type )) return FALSE;
if (image.Ok()) *this = image.ConvertToBitmap();
+ else return FALSE;
}
- else if (type == wxBITMAP_TYPE_BMP)
- {
- wxImage image;
- image.LoadFile( name, type );
- if (image.Ok()) *this = image.ConvertToBitmap();
- }
- else
- return FALSE;
return TRUE;
}
GdkPixmap *wxBitmap::GetPixmap() const
{
- wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_pixmap;
}
GdkBitmap *wxBitmap::GetBitmap() const
{
- wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, _T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_bitmap;
}
projects / wxWidgets.git / blobdiff