// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
-// Id:
+// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "gdk/gdkprivate.h"
#ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
#endif
//-----------------------------------------------------------------------------
{
};
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
{
};
// wxBitmap
//-----------------------------------------------------------------------------
+// CMB 20/5/98: added m_bitmap for GdkBitmaps
class wxBitmapRefData: public wxObjectRefData
{
public:
~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;
};
wxBitmapRefData::wxBitmapRefData(void)
{
m_pixmap = NULL;
+ m_bitmap = NULL;
m_mask = NULL;
m_width = 0;
m_height = 0;
m_bpp = 0;
m_palette = NULL;
+#ifdef USE_GDK_IMLIB
+ m_image = NULL;
+#endif
};
wxBitmapRefData::~wxBitmapRefData(void)
{
#ifdef USE_GDK_IMLIB
if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
+ if (m_image) gdk_imlib_destroy_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 (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
};
-wxBitmap::wxBitmap( const int width, const int height, const int depth )
+wxBitmap::wxBitmap( int width, int height, 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_width = width;
+ M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = depth;
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
wxBitmap::wxBitmap( char **bits )
{
m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = NULL;
#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 );
-#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) );
+
+#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);
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
};
-
-wxBitmap::wxBitmap( const wxString &filename, const int type )
+
+wxBitmap::wxBitmap( const wxString &filename, int type )
{
LoadFile( filename, type );
};
+// 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_BMPDATA->m_mask = 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);
+}
+
wxBitmap::~wxBitmap(void)
{
if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
return M_BMPDATA->m_bpp;
};
-void wxBitmap::SetHeight( const int height )
+void wxBitmap::SetHeight( int height )
{
if (!Ok()) return;
M_BMPDATA->m_height = height;
};
-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetWidth( int width )
{
if (!Ok()) return;
M_BMPDATA->m_width = width;
};
-void wxBitmap::SetDepth( const int depth )
+void wxBitmap::SetDepth( int depth )
{
if (!Ok()) return;
M_BMPDATA->m_bpp = depth;
wxMask *wxBitmap::GetMask(void) const
{
if (!Ok()) return NULL;
+
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;
};
-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type),
+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
+};
+
+bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
wxPalette *WXUNUSED(palette) )
{
+#ifdef USE_GDK_IMLIB
+
+ if (!Ok()) return FALSE;
+
+ if (!M_BMPDATA->m_image) RecreateImage();
+
+ return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, NULL );
+
+#endif
+
return FALSE;
};
-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
{
#ifdef USE_GDK_IMLIB
UnRef();
m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = NULL;
-
- GdkBitmap *mask = NULL;
- int res = gdk_imlib_load_file_to_pixmap( WXSTRINGCAST name, &M_BMPDATA->m_pixmap, &mask );
+ M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
- if (res != 1)
+ if (!M_BMPDATA->m_image)
{
UnRef();
return FALSE;
};
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
- }
+ Render();
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = 24; // ?
return M_BMPDATA->m_pixmap;
};
+GdkBitmap *wxBitmap::GetBitmap(void) const
+{
+ if (!Ok()) return NULL;
+
+ return M_BMPDATA->m_bitmap;
+};
+
+void wxBitmap::DestroyImage(void)
+{
+ if (!Ok()) return;
+
+ if (M_BMPDATA->m_image)
+ {
+ gdk_imlib_destroy_image( M_BMPDATA->m_image );
+ M_BMPDATA->m_image = NULL;
+ };
+};
+
+void wxBitmap::RecreateImage(void)
+{
+};
+
+void wxBitmap::Render(void)
+{
+ if (!Ok()) return;
+
+#ifdef USE_GDK_IMLIB
+
+ 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
+};
+
+
projects / wxWidgets.git / blobdiff