#include "wx/dcmemory.h"
#include "wx/app.h"
+#ifdef __WXGTK20__
+ // need this to get gdk_image_new_bitmap()
+ #define GDK_ENABLE_BROKEN
+#endif
+
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
-#endif
+#ifdef __WXGTK20__
+ #include <gdk/gdkimage.h>
+#else // GTK+ 1.2
+ #include <gdk/gdkrgb.h>
+#endif // GTK+ 2.0/1.2
extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
GdkGC *gc,
m_bitmap = (GdkBitmap*) NULL;
}
- wxImage image( bitmap );
+ wxImage image = bitmap.ConvertToImage();
if (!image.Ok()) return FALSE;
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
unsigned char green = colour.Green();
unsigned char blue = colour.Blue();
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
int bpp = visual->depth;
if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
red = red & 0xf8;
green = green & 0xf8;
blue = blue & 0xf8;
- }
+ } else
if (bpp == 16)
{
red = red & 0xf8;
green = green & 0xfc;
blue = blue & 0xf8;
+ } else
+ if (bpp == 12)
+ {
+ red = red & 0xf0;
+ green = green & 0xf0;
+ blue = blue & 0xf0;
}
color.red = 0;
wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
if (depth == -1) depth = visual->depth;
bool wxBitmap::CreateFromXpm( const char **bits )
{
+ UnRef();
+
wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
m_refData = new wxBitmapRefData();
}
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
- M_BMPDATA->m_bpp = visual->depth; // ?
+
+ M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ?
return TRUE;
}
bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
{
+ UnRef();
+
wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
SetDepth( 1 );
-
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
// Create picture image
SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
- // Retrieve depth, using XVisualInfo from app, if set
- GdkVisual *visual;
- if (wxTheApp->m_glVisualInfo)
- {
- visual = gdkx_visual_get( ((XVisualInfo *) wxTheApp->m_glVisualInfo)->visualid );
- }
- else
- {
- visual = gdk_window_get_visual( wxGetRootWindow()->window );
- }
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
int bpp = visual->depth;
SetDepth( bpp );
-
+
if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
if (bpp < 8) bpp = 8;
// We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
// visuals are not supported by GDK so we do these ourselves, too.
// 15-bit and 16-bit should actually work and 24-bit certainly does.
+#ifdef __sgi
+ if (!image.HasMask() && (bpp > 16))
+#else
if (!image.HasMask() && (bpp > 12))
+#endif
{
static bool s_hasInitialized = FALSE;
if (bpp > 8)
{
if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB;
- else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RGB;
+ else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RBG;
else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG;
else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask)) b_o = GRB;
guint32 pixel = 0;
switch (b_o)
{
- case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xfc) << 2) | ((b & 0xf8) >> 3); break;
- case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xfc) << 2) | ((g & 0xf8) >> 3); break;
- case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xfc) << 2) | ((b & 0xf8) >> 3); break;
- case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xfc) << 2) | ((r & 0xf8) >> 3); break;
- case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xfc) << 2) | ((g & 0xf8) >> 3); break;
- case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xfc) << 2) | ((r & 0xf8) >> 3); break;
+ case RGB: pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
+ case RBG: pixel = ((r & 0xf8) << 8) | ((b & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
+ case GRB: pixel = ((g & 0xf8) << 8) | ((r & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
+ case GBR: pixel = ((g & 0xf8) << 8) | ((b & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
+ case BRG: pixel = ((b & 0xf8) << 8) | ((r & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
+ case BGR: pixel = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
}
gdk_image_put_pixel( data_image, x, y, pixel );
break;
image.Create( GetWidth(), GetHeight() );
char unsigned *data = image.GetData();
-
+
if (!data)
{
gdk_image_destroy( gdk_image );
if (GetPixmap())
{
GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
-
- if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->window );
+ if (visual == NULL)
+ visual = wxTheApp->GetGdkVisual();
+
bpp = visual->depth;
if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
red_shift_right = visual->red_shift;
// Try to save the bitmap via wxImage handlers:
{
- wxImage image( *this );
+ wxImage image = ConvertToImage();
if (image.Ok()) return image.SaveFile( name, type );
}
if (!wxFileExists(name)) return FALSE;
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
if (type == wxBITMAP_TYPE_XPM)
{
{
wxImage image;
if (!image.LoadFile( name, type )) return FALSE;
- if (image.Ok()) *this = image.ConvertToBitmap();
+ if (image.Ok())
+ *this = wxBitmap(image);
else return FALSE;
}
projects / wxWidgets.git / blobdiff