Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / x11 / bitmap.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 9e919994abec18f2439509e1e4dce7d1293fe41c..b35d0861ac25df8eb109781615bde9e2ae98746d 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1,1344 +1,1622 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/x11/bitmap.cpp

 // Purpose:     wxBitmap
 // Purpose:     wxBitmap

-// Author:      Julian Smart
+// Author:      Julian Smart, Robert Roebling

 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart
+// Copyright:   (c) Julian Smart, Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/palette.h"

 #include "wx/bitmap.h"
 #include "wx/bitmap.h"

-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/control.h"
-#include "wx/dcmemory.h"
-#include "wx/image.h"
-#include "wx/app.h"
-
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#ifdef __VMS__
-#pragma message enable nosimpint
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/icon.h"
+    #include "wx/math.h"
+    #include "wx/image.h"

 #endif
 
 #include "wx/x11/private.h"
 
 #endif
 
 #include "wx/x11/private.h"
 

-#if wxHAVE_LIB_XPM
-    #include <X11/xpm.h>
+/* No point in using libXPM for NanoX */
+#if wxUSE_NANOX
+#undef wxHAVE_LIB_XPM
+#define wxHAVE_LIB_XPM 0
+
+// Copy from the drawable to the wxImage
+bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image);

 #endif
 #endif

-#include <math.h>

 
 

+static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap,
+                                int x, int y, int width, int height,
+                                int depth );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+#if wxUSE_XPM
+#if wxHAVE_LIB_XPM
+#include <X11/xpm.h>
+#else
+#include "wx/xpmdecod.h"
+#include "wx/wfstream.h"
+#endif
+#endif

 
 

-wxBitmapRefData::wxBitmapRefData()
-{
-    m_ok = FALSE;
-    m_width = 0;
-    m_height = 0;
-    m_depth = 0;
-    m_quality = 0;
-    m_numColors = 0;
-    m_bitmapMask = NULL;
+//-----------------------------------------------------------------------------
+// wxMask
+//-----------------------------------------------------------------------------

 
 

-    m_pixmap = (WXPixmap) 0;
-    m_display = (WXDisplay*) 0;
+IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)

 
 

-    m_freePixmap = TRUE; //TODO: necessary?
-    m_freeColors = (unsigned long*) 0;
-    m_freeColorsCount = 0;
+wxMask::wxMask()
+{
+    m_bitmap = NULL;
+    m_display = NULL;

 }
 
 }
 

-wxBitmapRefData::~wxBitmapRefData()
+wxMask::wxMask(const wxMask& mask)

 {
 {

-    if (m_pixmap && m_freePixmap)
-        XFreePixmap ((Display*) m_display, (Pixmap) m_pixmap);
-
-    if (m_freeColors)
+    m_display = mask.m_display;
+    if ( !mask.m_bitmap )

     {
     {

-        int screen = DefaultScreen((Display*) m_display);
-        Colormap cmp = DefaultColormap((Display*) m_display,screen);
-        long llp;
-        for(llp = 0;llp < m_freeColorsCount;llp++)
-            XFreeColors((Display*) m_display, cmp, &m_freeColors[llp], 1, 0L);
-        delete m_freeColors;
-    };
-
-    if (m_bitmapMask)
-        delete m_bitmapMask;
-    m_bitmapMask = NULL;
-}
-
-wxList wxBitmap::sm_handlers;
+        m_bitmap = NULL;
+        return;
+    }

 
 

-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+    m_size = mask.m_size;

 
 

-wxBitmap::wxBitmap()
-{
-    m_refData = NULL;
+    // Duplicate the mask bitmap using the existing wxGetSubPixmap() function.
+    // There are probably/surely better ways to do it.
+    m_bitmap = wxGetSubPixmap(m_display, mask.m_bitmap,
+                              0, 0, m_size.x, m_size.y,
+                              1);

 }
 
 }
 

-wxBitmap::~wxBitmap()
+wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )

 {
 {

+    m_bitmap = NULL;
+    Create( bitmap, colour );

 }
 
 }
 

-wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
+wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )

 {
 {

-    m_refData = new wxBitmapRefData;
-
-    (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
+    m_bitmap = NULL;
+    Create( bitmap, paletteIndex );

 }
 
 }
 

-wxBitmap::wxBitmap(int w, int h, int d)
+wxMask::wxMask( const wxBitmap& bitmap )

 {
 {

-    (void)Create(w, h, d);
+    m_bitmap = NULL;
+    Create( bitmap );

 }
 
 }
 

-wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
+wxMask::~wxMask()

 {
 {

-    (void) Create(data, type, width, height, depth);
+    if (m_bitmap)
+        XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap );

 }
 
 }
 

-wxBitmap::wxBitmap(const wxString& filename, long type)
+bool wxMask::Create( const wxBitmap& bitmap,
+                     const wxColour& colour )

 {
 {

-    LoadFile(filename, (int)type);
-}
+    m_size = bitmap.GetSize();

 
 

-wxBitmap::wxBitmap(char **data)
-{
-    (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
-}
+#if !wxUSE_NANOX
+    if (m_bitmap)
+    {
+        XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap );
+        m_bitmap = NULL;
+    }

 
 

-bool wxBitmap::Create(int w, int h, int d)
-{
-    UnRef();
+    m_display = bitmap.GetDisplay();

 
 

-    m_refData = new wxBitmapRefData;
+    wxImage image = bitmap.ConvertToImage();
+    if (!image.IsOk()) return false;

 
 

-    if (d < 1)
-        d = wxDisplayDepth();
+    m_display = bitmap.GetDisplay();

 
 

-    M_BITMAPDATA->m_width = w;
-    M_BITMAPDATA->m_height = h;
-    M_BITMAPDATA->m_depth = d;
-    M_BITMAPDATA->m_freePixmap = TRUE;
+    Display *xdisplay = (Display*) m_display;
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );

 
 

-    Display *dpy = (Display*) wxGetDisplay();
+    m_bitmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, image.GetWidth(), image.GetHeight(), 1 );
+    GC gc = XCreateGC( xdisplay, (Pixmap) m_bitmap, 0, NULL );

 
 

-    M_BITMAPDATA->m_display = dpy; /* MATTHEW: [4] Remember the display */
+    XSetForeground( xdisplay, gc, WhitePixel(xdisplay,xscreen) );
+    XSetFillStyle( xdisplay, gc, FillSolid );
+    XFillRectangle( xdisplay, (Pixmap) m_bitmap, gc, 0, 0, image.GetWidth(), image.GetHeight() );

 
 

-    M_BITMAPDATA->m_pixmap = (WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
-        w, h, d);
+    unsigned char *data = image.GetData();
+    int index = 0;

 
 

-    M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_pixmap != (WXPixmap) 0) ;
-    return M_BITMAPDATA->m_ok;
-}
+    unsigned char red = colour.Red();
+    unsigned char green = colour.Green();
+    unsigned char blue = colour.Blue();

 
 

-bool wxBitmap::LoadFile(const wxString& filename, long type)
-{
-    UnRef();
+    int bpp = wxTheApp->GetVisualInfo(m_display)->m_visualDepth;

 
 

-    m_refData = new wxBitmapRefData;
+    if (bpp == 15)
+    {
+        red &= 0xf8;
+        green &= 0xf8;
+        blue &= 0xf8;
+    } else
+    if (bpp == 16)
+    {
+        red &= 0xf8;
+        green &= 0xfc;
+        blue &= 0xf8;
+    } else
+    if (bpp == 12)
+    {
+        red &= 0xf0;
+        green &= 0xf0;
+        blue &= 0xf0;
+    }

 
 

-    wxBitmapHandler *handler = FindHandler(type);
+    XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );

 
 

-    if ( handler == NULL ) {
-        wxImage image;
-        if (!image.LoadFile( filename, type )) return FALSE;
-        if (image.Ok()) 
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+    for (int j = 0; j < height; j++)
+    {
+        int start_x = -1;
+        int i;
+        for (i = 0; i < width; i++)

         {
         {

-            *this = image.ConvertToBitmap();
-            return TRUE;
+            if ((data[index] == red) &&
+                (data[index+1] == green) &&
+                (data[index+2] == blue))
+            {
+                if (start_x == -1)
+                start_x = i;
+            }
+            else
+            {
+                if (start_x != -1)
+                {
+                    XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i-1, j );
+                    start_x = -1;
+                }
+            }
+            index += 3;

         }
         }

-        else return FALSE;
+        if (start_x != -1)
+            XDrawLine( xdisplay, (Pixmap) m_bitmap, gc, start_x, j, i, j );

     }
 
     }
 

-    return handler->LoadFile(this, filename, type, -1, -1);
+    XFreeGC( xdisplay, gc );
+
+    return true;
+#else
+    return false;
+#endif
+    // wxUSE_NANOX

 }
 
 }
 

-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )

 {
 {

-    UnRef();
+    unsigned char r,g,b;
+    wxPalette *pal = bitmap.GetPalette();

 
 

-    m_refData = new wxBitmapRefData;
+    wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );

 
 

-    wxBitmapHandler *handler = FindHandler(type);
+    pal->GetRGB(paletteIndex, &r, &g, &b);

 
 

-    if ( handler == NULL ) {
-        wxLogWarning("no data bitmap handler for type %d defined.", type);
+    return Create(bitmap, wxColour(r, g, b));
+}

 
 

-        return FALSE;
+bool wxMask::Create( const wxBitmap& bitmap )
+{
+#if !wxUSE_NANOX
+    if (m_bitmap)
+    {
+        XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap );
+        m_bitmap = NULL;

     }
 
     }
 

-    return handler->Create(this, data, type, width, height, depth);
-}
+    if (!bitmap.IsOk()) return false;

 
 

-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
-{
-    wxBitmapHandler *handler = FindHandler(type);
+    wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );

 
 

-    if ( handler == NULL ) { // try wxImage
-        wxImage image( *this );
-        if (image.Ok()) return image.SaveFile( filename, type );
-        else return FALSE;
-    }
+    m_display = bitmap.GetDisplay();

 
 

-    return handler->SaveFile(this, filename, type, palette);
-}
+    int xscreen = DefaultScreen( (Display*) m_display );
+    Window xroot = RootWindow( (Display*) m_display, xscreen );

 
 

-void wxBitmap::SetWidth(int w)
-{
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+    m_bitmap = (WXPixmap) XCreatePixmap( (Display*) m_display, xroot, bitmap.GetWidth(), bitmap.GetHeight(), 1 );

 
 

-    M_BITMAPDATA->m_width = w;
-}
+    if (!m_bitmap) return false;

 
 

-void wxBitmap::SetHeight(int h)
-{
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+    GC gc = XCreateGC( (Display*) m_display, (Pixmap) m_bitmap, 0, NULL );

 
 

-    M_BITMAPDATA->m_height = h;
-}
+    XCopyPlane( (Display*) m_display, (Pixmap) bitmap.GetBitmap(), (Pixmap) m_bitmap,
+       gc, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), 0, 0, 1 );

 
 

-void wxBitmap::SetDepth(int d)
-{
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+    XFreeGC( (Display*) m_display, gc );

 
 

-    M_BITMAPDATA->m_depth = d;
+    return true;
+#else
+    return false;
+#endif
+    // wxUSE_NANOX

 }
 
 }
 

-void wxBitmap::SetQuality(int q)
+//-----------------------------------------------------------------------------
+// wxBitmapRefData
+//-----------------------------------------------------------------------------
+
+class wxBitmapRefData : public wxGDIRefData

 {
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+public:
+    wxBitmapRefData();
+    wxBitmapRefData(const wxBitmapRefData& data);
+    virtual ~wxBitmapRefData();
+
+    // shouldn't be called more than once as it doesn't free the existing data
+    bool Create(int width, int height, int depth);
+
+    virtual bool IsOk() const { return m_pixmap || m_bitmap; }
+
+    Pixmap          m_pixmap;
+    Pixmap          m_bitmap;
+    Display        *m_display;
+    wxMask         *m_mask;
+    int             m_width;
+    int             m_height;
+    int             m_bpp;
+    wxPalette      *m_palette;
+};

 
 

-    M_BITMAPDATA->m_quality = q;
+wxBitmapRefData::wxBitmapRefData()
+{
+    m_pixmap = 0;
+    m_bitmap = 0;
+    m_display = NULL;
+    m_mask = NULL;
+    m_width = 0;
+    m_height = 0;
+    m_bpp = 0;
+    m_palette = NULL;

 }
 
 }
 

-void wxBitmap::SetOk(bool isOk)
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)

 {
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+    m_pixmap = 0;
+    m_bitmap = 0;
+    m_display = data.m_display;
+    m_mask = NULL; // FIXME: should copy
+    m_palette = NULL; // FIXME: should copy

 
 

-    M_BITMAPDATA->m_ok = isOk;
+    Create(data.m_width, data.m_height, data.m_bpp);

 }
 
 }
 

-void wxBitmap::SetPalette(const wxPalette& palette)
+bool wxBitmapRefData::Create(int width, int height, int depth)

 {
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+    m_width = width;
+    m_height = height;
+    m_bpp = depth;

 
 

-    M_BITMAPDATA->m_bitmapPalette = palette ;
-}
+    m_display = wxGlobalDisplay();

 
 

-void wxBitmap::SetMask(wxMask *mask)
-{
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+    wxCHECK_MSG( m_display, false, wxT("No display") );

 
 

-    M_BITMAPDATA->m_bitmapMask = mask ;
-}
+    int xscreen = DefaultScreen(m_display);
+    int bpp = DefaultDepth(m_display, xscreen);
+    if ( depth == -1 )
+        depth = bpp;

 
 

-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") );
+    wxCHECK_MSG( (depth == bpp) || (depth == 1), false,
+                 wxT("invalid bitmap depth") );

 
 

-    wxBitmap ret( rect.width, rect.height, 0 );
-    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+#if wxUSE_NANOX
+    m_pixmap = (WXPixmap) GrNewPixmap(width, height, NULL);
+#else // !wxUSE_NANOX
+    Window xroot = RootWindow(m_display, xscreen);

 
 

-   // The remaining still TODO
-   return ret;
-}
+    *(depth == 1 ? &m_bitmap : &m_pixmap) =
+        XCreatePixmap(m_display, xroot, width, height, depth);
+#endif // wxUSE_NANOX/!wxUSE_NANOX

 
 

-void wxBitmap::AddHandler(wxBitmapHandler *handler)
-{
-    sm_handlers.Append(handler);
-}
+    wxCHECK_MSG( m_pixmap || m_bitmap, false, wxT("Bitmap creation failed") );

 
 

-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
-{
-    sm_handlers.Insert(handler);
+    return true;

 }
 
 }
 

-bool wxBitmap::RemoveHandler(const wxString& name)
+wxBitmapRefData::~wxBitmapRefData()

 {
 {

-    wxBitmapHandler *handler = FindHandler(name);
-    if ( handler )
-    {
-        sm_handlers.DeleteObject(handler);
-        return TRUE;
-    }
-    else
-        return FALSE;
+    if (m_pixmap)
+       XFreePixmap(m_display, m_pixmap);
+    if (m_bitmap)
+       XFreePixmap(m_display, m_bitmap);
+    delete m_mask;
+    delete m_palette;

 }
 
 }
 

-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if ( handler->GetName() == name )
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
+//-----------------------------------------------------------------------------

 
 

-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if ( handler->GetExtension() == extension &&
-            (bitmapType == -1 || handler->GetType() == bitmapType) )
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
+// helper function

 
 

-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
+static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap,
+                                int x, int y, int width, int height,
+                                int depth )

 {
 {

-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if (handler->GetType() == bitmapType)
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
+    Display * const dpy = (Display *)xdisplay;

 
 

-/*
-* wxMask
-*/
+    int xscreen = DefaultScreen( dpy );
+    Window xroot = RootWindow( dpy, xscreen );
+    Visual* xvisual = DefaultVisual( dpy, xscreen );

 
 

-wxMask::wxMask()
-{
-    m_pixmap = (WXPixmap) 0;
-}
+    XImage* ximage = XCreateImage( dpy, xvisual, depth,
+                                   ZPixmap, 0, 0, width, height, 32, 0 );
+    ximage->data = (char*)malloc( ximage->bytes_per_line * ximage->height );
+    ximage = XGetSubImage( dpy, (Pixmap)xpixmap,
+                           x, y, width, height,
+                           AllPlanes, ZPixmap, ximage, 0, 0 );

 
 

-// Construct a mask from a bitmap and a colour indicating
-// the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
-{
-    m_pixmap = (WXPixmap) 0;
+    GC gc = XCreateGC( dpy, (Pixmap)xpixmap, 0, NULL );
+    Pixmap ret = XCreatePixmap( dpy, xroot,
+                                width, height, depth );
+
+    XPutImage( dpy, ret, gc, ximage,
+               0, 0, 0, 0, width, height );
+    XDestroyImage( ximage );
+    XFreeGC( dpy, gc );

 
 

-    Create(bitmap, colour);
+    return (WXPixmap)ret;

 }
 
 }
 

-// Construct a mask from a bitmap and a palette index indicating
-// the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
-{
-    m_pixmap = (WXPixmap) 0;

 
 

-    Create(bitmap, paletteIndex);
-}
+//-----------------------------------------------------------------------------
+// wxBitmap
+//-----------------------------------------------------------------------------

 
 

-// Construct a mask from a mono bitmap (copies the bitmap).
-wxMask::wxMask(const wxBitmap& bitmap)
-{
-    m_pixmap = (WXPixmap) 0;
+#define M_BMPDATA ((wxBitmapRefData *)m_refData)

 
 

-    Create(bitmap);
-}
+IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)

 
 

-wxMask::~wxMask()
+bool wxBitmap::Create( int width, int height, int depth )

 {
 {

-    // TODO: this may be the wrong display
-    if ( m_pixmap )
-        XFreePixmap ((Display*) wxGetDisplay(), (Pixmap) m_pixmap);
-}
+    UnRef();

 
 

-// Create a mask from a mono bitmap (copies the bitmap).
-bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap))
-{
-    // TODO
-    return FALSE;
+    wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
+
+    m_refData = new wxBitmapRefData();
+
+    return M_BMPDATA->Create(width, height, depth);

 }
 
 }
 

-// Create a mask from a bitmap and a palette index indicating
-// the transparent area
-bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex))
+bool wxBitmap::Create(const void* data, wxBitmapType type,
+                      int width, int height, int depth)

 {
 {

-    // TODO
-    return FALSE;
+    UnRef();
+
+    wxBitmapHandler *handler = FindHandler(type);
+
+    if ( handler == NULL ) {
+        wxLogWarning(wxT("no data bitmap handler for type %ld defined."),
+                     (long)type);
+
+        return false;
+    }
+
+    return handler->Create(this, data, type, width, height, depth);

 }
 
 }
 

-// Create a mask from a bitmap and a colour indicating
-// the transparent area
-bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour))
+bool wxBitmap::Create(WXPixmap pixmap)

 {
 {

-    // TODO
-    return FALSE;
-}
+    UnRef();
+    Pixmap xpixmap = (Pixmap)pixmap;
+    Display* xdisplay = wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );

 
 

-/*
-* wxBitmapHandler
-*/
+    // make a copy of the Pixmap
+    Window root;
+    int x, y;
+    unsigned width, height, border, depth;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+    XGetGeometry( xdisplay, (Drawable)xpixmap, &root, &x, &y,
+                  &width, &height, &border, &depth );
+    Pixmap copy = XCreatePixmap( xdisplay, xroot, width, height, depth );

 
 

-bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type),
-                             int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
-{
-    return FALSE;
+    GC gc = XCreateGC( xdisplay, copy, 0, NULL );
+    XCopyArea( xdisplay, xpixmap, copy, gc, 0, 0, width, height, 0, 0 );
+    XFreeGC( xdisplay, gc );
+
+    // fill in ref data
+    wxBitmapRefData* ref = new wxBitmapRefData();
+
+    if( depth == 1 )
+        ref->m_bitmap = copy;
+    else
+        ref->m_pixmap = copy;
+
+    ref->m_display = xdisplay;
+    ref->m_width = width;
+    ref->m_height = height;
+    ref->m_bpp = depth;
+
+    m_refData = ref;
+
+    return true;

 }
 
 }
 

-bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
-                               int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
+wxBitmap::wxBitmap(const char* const* bits)

 {
 {

-    return FALSE;
+    Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);

 }
 
 }
 

-bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type),
-                               const wxPalette *WXUNUSED(palette))
+wxGDIRefData *wxBitmap::CreateGDIRefData() const

 {
 {

-    return FALSE;
+    return new wxBitmapRefData;

 }
 
 }
 

-/*
-* Standard handlers
-*/
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
+}

 
 

-class WXDLLEXPORT wxXBMFileHandler: public wxBitmapHandler
+bool wxBitmap::CreateFromImage( const wxImage& image, int depth )

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxXBMFileHandler)
-public:
-    inline wxXBMFileHandler()
+#if wxUSE_NANOX
+    if (!image.IsOk())

     {
     {

-        m_name = "XBM file";
-        m_extension = "xbm";
-        m_type = wxBITMAP_TYPE_XBM;
-    };
+        wxASSERT_MSG(image.IsOk(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage."));
+        return false;
+    }

 
 

-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-        int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler)
+    int w = image.GetWidth();
+    int h = image.GetHeight();

 
 

-bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
-                                int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
-    M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
+    if (!Create(w, h, depth))
+        return false;

 
 

-    int hotX, hotY;
-    unsigned int w, h;
-    Pixmap pixmap;
+    // Unfortunately the mask has to be screen-depth since
+    // 1-bpp bitmaps don't seem to be supported
+    // TODO: implement transparent drawing, presumably
+    // by doing several blits as per the Windows
+    // implementation because Nano-X doesn't support
+    // XSetClipMask.
+    // TODO: could perhaps speed this function up
+    // by making a buffer of pixel values,
+    // and then calling GrArea to write that to the
+    // pixmap. See demos/nxroach.c.
+
+    bool hasMask = image.HasMask();

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    M_BITMAPDATA->m_display = (WXDisplay*) dpy;
+    GC pixmapGC = GrNewGC();
+    Pixmap pixmap = (Pixmap) GetPixmap();

 
 

-    int value = XReadBitmapFile (dpy, RootWindow (dpy, DefaultScreen (dpy)),
-        (char*) (const char*) name, &w, &h, &pixmap, &hotX, &hotY);
-    M_BITMAPHANDLERDATA->m_width = w;
-    M_BITMAPHANDLERDATA->m_height = h;
-    M_BITMAPHANDLERDATA->m_depth = 1;
-    M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
+    GC maskGC = 0;
+    Pixmap maskPixmap = 0;

 
 

-    if ((value == BitmapFileInvalid) ||
-        (value == BitmapOpenFailed) ||
-        (value == BitmapNoMemory))
+    unsigned char maskR = 0;
+    unsigned char maskG = 0;
+    unsigned char maskB = 0;
+
+    if (hasMask)

     {
     {

-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) 0;
+        maskR = image.GetMaskRed();
+        maskG = image.GetMaskGreen();
+        maskB = image.GetMaskBlue();
+
+        maskGC = GrNewGC();
+        maskPixmap = GrNewPixmap(w, h, 0);
+        if (!maskPixmap)
+            hasMask = false;
+        else
+        {
+            wxMask* mask = new wxMask;
+            mask->SetBitmap((WXPixmap) maskPixmap);
+            SetMask(mask);
+        }

     }
     }

-    else
-        M_BITMAPHANDLERDATA->m_ok = TRUE;

 
 

-    return M_BITMAPHANDLERDATA->m_ok ;
-}
+    GR_COLOR lastPixmapColour = 0;
+    GR_COLOR lastMaskColour = 0;

 
 

-class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxXBMDataHandler)
-public:
-    inline wxXBMDataHandler()
+    int i, j;
+    for (i = 0; i < w; i++)

     {
     {

-        m_name = "XBM data";
-        m_extension = "xbm";
-        m_type = wxBITMAP_TYPE_XBM_DATA;
-    };
+        for (j = 0; j < h; j++)
+        {
+            unsigned char red = image.GetRed(i, j);
+            unsigned char green = image.GetGreen(i, j);
+            unsigned char blue = image.GetBlue(i, j);

 
 

-    virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
+            GR_COLOR colour = GR_RGB(red, green, blue);

 
 

-bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *data, long WXUNUSED(flags),
-                              int width, int height, int WXUNUSED(depth))
-{
-    M_BITMAPHANDLERDATA->m_width = width;
-    M_BITMAPHANDLERDATA->m_height = height;
-    M_BITMAPHANDLERDATA->m_depth = 1;
-    M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
+            // Efficiency measure
+            if (colour != lastPixmapColour || (i == 0 && j == 0))
+            {
+                GrSetGCForeground(pixmapGC, colour);
+                lastPixmapColour = colour;
+            }
+
+            GrPoint(pixmap, pixmapGC, i, j);
+
+            if (hasMask)
+            {
+                // scan the bitmap for the transparent colour and set the corresponding
+                // pixels in the mask to BLACK and the rest to WHITE
+                if (maskR == red && maskG == green && maskB == blue)
+                {
+                    colour = GR_RGB(0, 0, 0);
+                }
+                else
+                {
+                    colour = GR_RGB(255, 255, 255);
+                }
+                if (colour != lastMaskColour || (i == 0 && j == 0))
+                {
+                    GrSetGCForeground(maskGC, colour);
+                    lastMaskColour = colour;
+                }
+                GrPoint(maskPixmap, maskGC, i, j);
+            }
+        }
+    }

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
+    GrDestroyGC(pixmapGC);
+    if (hasMask)
+        GrDestroyGC(maskGC);

 
 

-    M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) XCreateBitmapFromData (dpy, RootWindow (dpy, DefaultScreen (dpy)), (char*) data, width, height);
-    M_BITMAPHANDLERDATA->m_ok = (M_BITMAPHANDLERDATA->m_pixmap != (WXPixmap) 0) ;
+    return true;
+#else
+    // !wxUSE_NANOX

 
 

-    return TRUE;
-}
+    UnRef();

 
 

-#if wxHAVE_LIB_XPM
-class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
-public:
-    inline wxXPMFileHandler()
-    {
-        m_name = "XPM file";
-        m_extension = "xpm";
-        m_type = wxBITMAP_TYPE_XPM;
-    };
+    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
+    wxCHECK_MSG( depth == -1, false, wxT("invalid bitmap depth") );

 
 

-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-        int desiredWidth, int desiredHeight);
-    virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
+    m_refData = new wxBitmapRefData();

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
+    M_BMPDATA->m_display = wxGlobalDisplay();

 
 

-bool wxXPMFileHandler::LoadFile( wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
-                                int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight) )
-{
-    Display *dpy = (Display*) wxGetDisplay();
-    M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
+    Display *xdisplay = (Display*) M_BMPDATA->m_display;

 
 

-    XpmAttributes xpmAttr;
-    Pixmap pixmap;
-    Pixmap mask = 0;
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );
+    Visual* xvisual = DefaultVisual( xdisplay, xscreen );
+
+    int bpp = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth;
+
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+    M_BMPDATA->m_width = width;
+    M_BMPDATA->m_height = height;

 
 

-    M_BITMAPHANDLERDATA->m_ok = FALSE;
-    xpmAttr.valuemask = XpmReturnInfos | XpmCloseness;
-    xpmAttr.closeness = 40000;
-    int errorStatus = XpmReadFileToPixmap(dpy,
-        RootWindow(dpy, DefaultScreen(dpy)), (char*) (const char*) name,
-        &pixmap, &mask, &xpmAttr);
+    if (depth != 1) depth = bpp;
+    M_BMPDATA->m_bpp = depth;

 
 

-    if (errorStatus == XpmSuccess)
+    if (depth == 1)
+    {
+        wxFAIL_MSG( wxT("mono images later") );
+    }
+    else

     {
     {

-        M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
-        if ( mask )
+        // Create image
+
+        XImage *data_image = XCreateImage( xdisplay, xvisual, bpp, ZPixmap, 0, 0, width, height, 32, 0 );
+        data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height );
+
+        if (data_image->data == NULL)

         {
         {

-            M_BITMAPHANDLERDATA->m_bitmapMask = new wxMask;
-            M_BITMAPHANDLERDATA->m_bitmapMask->SetPixmap((WXPixmap) mask);
+            wxLogError( wxT("Out of memory.") );  // TODO clean
+            return false;

         }
 
         }
 

-        unsigned int depthRet;
-        int xRet, yRet;
-        unsigned int widthRet, heightRet, borderWidthRet;
-        Window rootWindowRet;
-        XGetGeometry(dpy, pixmap, &rootWindowRet, &xRet, &yRet,
-            &widthRet, &heightRet, &borderWidthRet, &depthRet);
+        M_BMPDATA->m_pixmap = XCreatePixmap( xdisplay, xroot, width, height, depth );

 
 

-        M_BITMAPHANDLERDATA->m_width = xpmAttr.width;
-        M_BITMAPHANDLERDATA->m_height = xpmAttr.height;
+        // Create mask if necessary
+        const bool hasMask = image.HasMask();

 
 

-        /*
-        if ( xpmAttr.npixels > 2 )
-        {
-        M_BITMAPHANDLERDATA->m_depth = 8;      // TODO: next time not just a guess :-) ...
-        } else
+        XImage *mask_image = NULL;
+        if ( hasMask )

         {
         {

-        M_BITMAPHANDLERDATA->m_depth = 1;      // mono
-        }
-        */
+            mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 );
+            mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height );

 
 

-        M_BITMAPHANDLERDATA->m_depth = depthRet;
+            if (mask_image->data == NULL)
+            {
+                wxLogError( wxT("Out of memory.") ); // TODO clean
+                return false;
+            }

 
 

-        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
+            wxMask *mask = new wxMask();
+            mask->SetDisplay( xdisplay );
+            mask->SetBitmap( (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, 1 ) );

 
 

-        XpmFreeAttributes(&xpmAttr);
+            SetMask( mask );
+        }

 
 

-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        return TRUE;
-    } else
-    {
-        //      XpmDebugError(errorStatus, name);
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        return FALSE;
-    }
-}
+        if (bpp < 8) bpp = 8;

 
 

-bool wxXPMFileHandler::SaveFile( wxBitmap *bitmap, const wxString& name, int WXUNUSED(type),
-                                const wxPalette *WXUNUSED(palette))
-{
-    if (M_BITMAPHANDLERDATA->m_ok && M_BITMAPHANDLERDATA->m_pixmap)
-    {
-        Display *dpy =  (Display*) M_BITMAPHANDLERDATA->m_display;
-        int errorStatus = XpmWriteFileFromPixmap(dpy, (char*) (const char*) name,
-            (Pixmap) M_BITMAPHANDLERDATA->m_pixmap,
-            (M_BITMAPHANDLERDATA->m_bitmapMask ? (Pixmap) M_BITMAPHANDLERDATA->m_bitmapMask->GetPixmap() : (Pixmap) 0),
-            (XpmAttributes *) NULL);
-        if (errorStatus == XpmSuccess)
-            return TRUE;
-        else
-            return FALSE;
-    }
-    else
-        return FALSE;
-}
+        // Render

 
 

-class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
-public:
-    inline wxXPMDataHandler()
-    {
-        m_name = "XPM data";
-        m_extension = "xpm";
-        m_type = wxBITMAP_TYPE_XPM_DATA;
-    };
+        enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
+        byte_order b_o = RGB;

 
 

-    virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
+        wxXVisualInfo* vi = wxTheApp->GetVisualInfo(M_BMPDATA->m_display);
+        unsigned long greenMask = vi->m_visualGreenMask,
+                      redMask   = vi->m_visualRedMask,
+                      blueMask  = vi->m_visualBlueMask;

 
 

-bool wxXPMDataHandler::Create( wxBitmap *bitmap, void *data, long WXUNUSED(flags),
-                              int width, int height, int WXUNUSED(depth))
-{
-    M_BITMAPHANDLERDATA->m_width = width;
-    M_BITMAPHANDLERDATA->m_height = height;
-    M_BITMAPHANDLERDATA->m_depth = 1;
-    M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
+        if (bpp > 8)
+        {
+            if ((redMask > greenMask) && (greenMask > blueMask))     b_o = RGB;
+            else if ((redMask > blueMask) && (blueMask > greenMask)) b_o = RBG;
+            else if ((blueMask > redMask) && (redMask > greenMask))  b_o = BRG;
+            else if ((blueMask > greenMask) && (greenMask > redMask))b_o = BGR;
+            else if ((greenMask > redMask) && (redMask > blueMask))  b_o = GRB;
+            else if ((greenMask > blueMask) && (blueMask > redMask)) b_o = GBR;
+        }

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
+        int r_mask = image.GetMaskRed();
+        int g_mask = image.GetMaskGreen();
+        int b_mask = image.GetMaskBlue();

 
 

-    XpmAttributes xpmAttr;
+        unsigned char* data = image.GetData();
+        wxASSERT_MSG( data, wxT("No image data") );

 
 

-    xpmAttr.valuemask = XpmReturnInfos;    /* nothing yet, but get infos back */
+        unsigned char *colorCube =
+            wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube;

 
 

-    XpmColorSymbol symbolicColors[4];
-    if (sg_Control && sg_Control->GetMainWidget())
-    {
-        symbolicColors[0].name = "foreground";
-        symbolicColors[0].value = NULL;
-        symbolicColors[1].name = "background";
-        symbolicColors[1].value = NULL;
-        XtVaGetValues((Widget) sg_Control->GetMainWidget(),
-            XmNforeground,  &symbolicColors[0].pixel,
-            XmNbackground,  &symbolicColors[1].pixel,NULL);
-        xpmAttr.numsymbols = 2;
-        xpmAttr.colorsymbols = symbolicColors;
-        xpmAttr.valuemask |= XpmColorSymbols;    // add flag
-    }
+        int index = 0;
+        for (int y = 0; y < height; y++)
+        {
+            for (int x = 0; x < width; x++)
+            {
+                int r = data[index];
+                index++;
+                int g = data[index];
+                index++;
+                int b = data[index];
+                index++;
+
+                if (hasMask)
+                {
+                    if ((r == r_mask) && (b == b_mask) && (g == g_mask))
+                        XPutPixel( mask_image, x, y, 0 );
+                    else
+                        XPutPixel( mask_image, x, y, 1 );
+                }

 
 

-    Pixmap pixmap;
-    Pixmap mask = 0;
-    int ErrorStatus = XpmCreatePixmapFromData(dpy, RootWindow(dpy, DefaultScreen(dpy)),
-        (char**) data, &pixmap, &mask, &xpmAttr);
-    if (ErrorStatus == XpmSuccess)
-    {
-        // Set attributes
-        M_BITMAPHANDLERDATA->m_width = xpmAttr.width;
-        M_BITMAPHANDLERDATA->m_height = xpmAttr.height;
+                switch (bpp)
+                {
+                    case 8:
+                    {
+                        int pixel = 0;
+                        pixel = colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
+                        XPutPixel( data_image, x, y, pixel );
+                        break;
+                    }
+                    case 12:  // SGI only
+                    {
+                        int pixel = 0;
+                        switch (b_o)
+                        {
+                            case RGB: pixel = ((r & 0xf0) << 4) | (g & 0xf0) | ((b & 0xf0) >> 4); break;
+                            case RBG: pixel = ((r & 0xf0) << 4) | (b & 0xf0) | ((g & 0xf0) >> 4); break;
+                            case GRB: pixel = ((g & 0xf0) << 4) | (r & 0xf0) | ((b & 0xf0) >> 4); break;
+                            case GBR: pixel = ((g & 0xf0) << 4) | (b & 0xf0) | ((r & 0xf0) >> 4); break;
+                            case BRG: pixel = ((b & 0xf0) << 4) | (r & 0xf0) | ((g & 0xf0) >> 4); break;
+                            case BGR: pixel = ((b & 0xf0) << 4) | (g & 0xf0) | ((r & 0xf0) >> 4); break;
+                        }
+                        XPutPixel( data_image, x, y, pixel );
+                        break;
+                    }
+                    case 15:
+                    {
+                        int pixel = 0;
+                        switch (b_o)
+                        {
+                            case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
+                            case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
+                            case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
+                            case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
+                            case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
+                            case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
+                        }
+                        XPutPixel( data_image, x, y, pixel );
+                        break;
+                    }
+                    case 16:
+                    {
+                        // I actually don't know if for 16-bit displays, it is alway the green
+                        // component or the second component which has 6 bits.
+                        int pixel = 0;
+                        switch (b_o)
+                        {
+                            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;
+                        }
+                        XPutPixel( data_image, x, y, pixel );
+                        break;
+                    }
+                    case 32:
+                    case 24:
+                    {
+                        int pixel = 0;
+                        switch (b_o)
+                        {
+                            case RGB: pixel = (r << 16) | (g << 8) | b; break;
+                            case RBG: pixel = (r << 16) | (b << 8) | g; break;
+                            case BRG: pixel = (b << 16) | (r << 8) | g; break;
+                            case BGR: pixel = (b << 16) | (g << 8) | r; break;
+                            case GRB: pixel = (g << 16) | (r << 8) | b; break;
+                            case GBR: pixel = (g << 16) | (b << 8) | r; break;
+                        }
+                        XPutPixel( data_image, x, y, pixel );
+                    }
+                    default: break;
+                }
+            } // for
+        }  // for

 
 

-        unsigned int depthRet;
-        int xRet, yRet;
-        unsigned int widthRet, heightRet, borderWidthRet;
-        Window rootWindowRet;
-        XGetGeometry(dpy, pixmap, &rootWindowRet, &xRet, &yRet,
-            &widthRet, &heightRet, &borderWidthRet, &depthRet);
+        // Blit picture

 
 

-            /*
-            if ( xpmAttr.npixels > 2 )
-            {
-            M_BITMAPHANDLERDATA->m_depth = 8;    // next time not just a guess :-) ...
-            } else
-            {
-            M_BITMAPHANDLERDATA->m_depth = 1;    // mono
-            }
-        */
+        GC gc = XCreateGC( xdisplay, (Pixmap) M_BMPDATA->m_pixmap, 0, NULL );
+        XPutImage( xdisplay, (Pixmap) M_BMPDATA->m_pixmap, gc, data_image, 0, 0, 0, 0, width, height );
+        XDestroyImage( data_image );
+        XFreeGC( xdisplay, gc );

 
 

-        M_BITMAPHANDLERDATA->m_depth = depthRet;
+        // Blit mask

 
 

-        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-        XpmFreeAttributes(&xpmAttr);
-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
-        if ( mask )
+        if (image.HasMask())

         {
         {

-            M_BITMAPHANDLERDATA->m_bitmapMask = new wxMask;
-            M_BITMAPHANDLERDATA->m_bitmapMask->SetPixmap((WXPixmap) mask);
+            GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL );
+            XPutImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), gc, mask_image, 0, 0, 0, 0, width, height );
+
+            XDestroyImage( mask_image );
+            XFreeGC( xdisplay, gc );

         }
     }
         }
     }

-    else
-    {
-        //      XpmDebugError(ErrorStatus, NULL);
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-    }
-    return M_BITMAPHANDLERDATA->m_ok ;
-}

 
 

-#endif // wxHAVE_LIB_XPM
-
-void wxBitmap::CleanUpHandlers()
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        wxNode *next = node->Next();
-        delete handler;
-        delete node;
-        node = next;
-    }
+    return true;
+#endif
+    // wxUSE_NANOX

 }
 
 }
 

-void wxBitmap::InitStandardHandlers()
+wxImage wxBitmap::ConvertToImage() const

 {
 {

-    // Initialize all standard bitmap or derived class handlers here.
-    AddHandler(new wxXBMFileHandler);
-    AddHandler(new wxXBMDataHandler);
+    wxImage image;

 
 

-    // XPM is considered standard for Motif, although it can be omitted if
-    // libXpm is not installed
-#if wxHAVE_LIB_XPM
-    AddHandler(new wxXPMFileHandler);
-    AddHandler(new wxXPMDataHandler);
-#endif // wxHAVE_LIB_XPM
-}
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );

 
 

-// We may need this sometime...
+    Display *xdisplay = (Display*) M_BMPDATA->m_display;
+    wxASSERT_MSG( xdisplay, wxT("No display") );

 
 

-/****************************************************************************
+#if wxUSE_NANOX
+    //int bpp = DefaultDepth(xdisplay, xscreen);
+    wxGetImageFromDrawable((Pixmap) GetPixmap(), 0, 0, GetWidth(), GetHeight(), image);
+    return image;
+#else
+    // !wxUSE_NANOX
+    int bpp = wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_visualDepth;
+    XImage *x_image = NULL;
+    if (GetPixmap())
+    {
+        x_image = XGetImage( xdisplay, (Pixmap) GetPixmap(),
+            0, 0,
+            GetWidth(), GetHeight(),
+            AllPlanes, ZPixmap );
+    } else
+    if (GetBitmap())
+    {
+        x_image = XGetImage( xdisplay, (Pixmap) GetBitmap(),
+            0, 0,
+            GetWidth(), GetHeight(),
+            AllPlanes, ZPixmap );
+    } else
+    {
+        wxFAIL_MSG( wxT("Ill-formed bitmap") );
+    }

 
 

-  NAME
-  XCreateInsensitivePixmap - create a grayed-out copy of a pixmap
+    wxCHECK_MSG( x_image, wxNullImage, wxT("couldn't create image") );

 
 

-  SYNOPSIS
-  Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
+    image.Create( GetWidth(), GetHeight() );
+    char unsigned *data = image.GetData();

 
 

-  DESCRIPTION
-  This function creates a grayed-out copy of the argument pixmap, suitable
-  for use as a XmLabel's XmNlabelInsensitivePixmap resource.
+    if (!data)
+    {
+        XDestroyImage( x_image );
+        wxFAIL_MSG( wxT("couldn't create image") );
+        return wxNullImage;
+    }

 
 

-  RETURN VALUES
-  The return value is the new Pixmap id or zero on error.  Errors include
-  a NULL display argument or an invalid Pixmap argument.
+    XImage *x_image_mask = NULL;
+    if (GetMask())
+    {
+        x_image_mask = XGetImage( xdisplay, (Pixmap) GetMask()->GetBitmap(),
+            0, 0,
+            GetWidth(), GetHeight(),
+            AllPlanes, ZPixmap );

 
 

-  ERRORS
-  If one of the XLib functions fail, it will produce a X error.  The
-  default X error handler prints a diagnostic and calls exit().
+        image.SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
+    }

 
 

-  SEE ALSO
-  XCopyArea(3), XCreateBitmapFromData(3), XCreateGC(3), XCreatePixmap(3),
-  XFillRectangle(3), exit(2)
+    int red_shift_right = 0;
+    int green_shift_right = 0;
+    int blue_shift_right = 0;
+    int red_shift_left = 0;
+    int green_shift_left = 0;
+    int blue_shift_left = 0;
+    bool use_shift = false;

 
 

-  AUTHOR
-  John R Veregge - john@puente.jpl.nasa.gov
-  Advanced Engineering and Prototyping Group (AEG)
-  Information Systems Technology Section (395)
-  Jet Propulsion Lab - Calif Institute of Technology
+    if (GetPixmap())
+    {
+        wxXVisualInfo* vi = wxTheApp->GetVisualInfo(M_BMPDATA->m_display);

 
 

-*****************************************************************************/
+        red_shift_right = vi->m_visualRedShift;
+        red_shift_left = 8 - vi->m_visualRedPrec;
+        green_shift_right = vi->m_visualGreenShift;
+        green_shift_left = 8 - vi->m_visualGreenPrec;
+        blue_shift_right = vi->m_visualBlueShift;
+        blue_shift_left = 8 - vi->m_visualBluePrec;

 
 

-Pixmap
-XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
+        use_shift = (vi->m_visualType == GrayScale) ||
+                    (vi->m_visualType != PseudoColor);
+    }

 
 

-{
-    static char stipple_data[] =
-        {
-            0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
-            0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
-            0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
-            0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA
-        };
-    GC        gc;
-    Pixmap    ipixmap, stipple;
-    unsigned    width, height, depth;
-
-    Window    window;    /* These return values */
-    unsigned    border;    /* from XGetGeometry() */
-    int        x, y;    /* are not needed.     */
-
-    ipixmap = 0;
-
-    if ( NULL == display || 0 == pixmap )
-        return ipixmap;
-
-    if ( 0 == XGetGeometry( display, pixmap, &window, &x, &y,
-                &width, &height, &border, &depth )
-       )
-        return ipixmap; /* BadDrawable: probably an invalid pixmap */
-
-    /* Get the stipple pixmap to be used to 'gray-out' the argument pixmap.
-     */
-    stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 );
-    if ( 0 != stipple )
+    if (GetBitmap())
+    {
+        bpp = 1;
+    }
+
+    XColor *colors = (XColor*)wxTheApp->
+        GetVisualInfo(M_BMPDATA->m_display)->m_visualColormap;
+
+    int width = GetWidth();
+    int height = GetHeight();
+    long pos = 0;
+    for (int j = 0; j < height; j++)

     {
     {

-        gc = XCreateGC( display, pixmap, (XtGCMask)0, (XGCValues*)NULL );
-        if ( NULL != gc )
+        for (int i = 0; i < width; i++)

         {
         {

-            /* Create an identical copy of the argument pixmap.
-             */
-            ipixmap = XCreatePixmap( display, pixmap, width, height, depth );
-            if ( 0 != ipixmap )
+            unsigned long pixel = XGetPixel( x_image, i, j );
+            if (bpp == 1)
+            {
+                if (pixel == 0)
+                {
+                    data[pos]   = 0;
+                    data[pos+1] = 0;
+                    data[pos+2] = 0;
+                }
+                else
+                {
+                    data[pos]   = 255;
+                    data[pos+1] = 255;
+                    data[pos+2] = 255;
+                }
+            }
+            else if (use_shift)
+            {
+                data[pos] =   (unsigned char)((pixel >> red_shift_right)   << red_shift_left);
+                data[pos+1] = (unsigned char)((pixel >> green_shift_right) << green_shift_left);
+                data[pos+2] = (unsigned char)((pixel >> blue_shift_right)  << blue_shift_left);
+            }
+            else if (colors)
+            {
+                data[pos] =   (unsigned char)(colors[pixel].red   >> 8);
+                data[pos+1] = (unsigned char)(colors[pixel].green >> 8);
+                data[pos+2] = (unsigned char)(colors[pixel].blue  >> 8);
+            }
+            else
+            {
+                wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") );
+            }
+
+            if (x_image_mask)

             {
             {

-                /* Copy the argument pixmap into the new pixmap.
-                 */
-                XCopyArea( display, pixmap, ipixmap,
-                        gc, 0, 0, width, height, 0, 0 );
-
-                /* Refill the new pixmap using the stipple algorithm/pixmap.
-                 */
-                XSetStipple( display, gc, stipple );
-                XSetFillStyle( display, gc, FillStippled );
-                XFillRectangle( display, ipixmap, gc, 0, 0, width, height );
+                int mask_pixel = XGetPixel( x_image_mask, i, j );
+                if (mask_pixel == 0)
+                {
+                    data[pos] = 16;
+                    data[pos+1] = 16;
+                    data[pos+2] = 16;
+                }

             }
             }

-            XFreeGC( display, gc );
+
+            pos += 3;

         }
         }

-        XFreePixmap( display, stipple );

     }
     }

-    return ipixmap;
+
+    XDestroyImage( x_image );
+    if (x_image_mask) XDestroyImage( x_image_mask );
+    return image;
+#endif
+    // wxUSE_NANOX

 }
 
 }
 

-// Creates a bitmap with transparent areas drawn in
-// the given colour.
-wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)
+wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )

 {
 {

-    wxBitmap newBitmap(bitmap.GetWidth(),
-        bitmap.GetHeight(),
-        bitmap.GetDepth());
-    wxMemoryDC destDC;
-    wxMemoryDC srcDC;
-    srcDC.SelectObject(bitmap);
-    destDC.SelectObject(newBitmap);
-
-    wxBrush brush(colour, wxSOLID);
-    destDC.SetOptimization(FALSE);
-    destDC.SetBackground(brush);
-    destDC.Clear();
-    destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & srcDC, 0, 0, wxCOPY, TRUE);
-
-    return newBitmap;
+    LoadFile( filename, type );

 }
 
 }
 

+wxBitmap::wxBitmap( const char bits[], int width, int height, int depth )
+{
+    m_refData = new wxBitmapRefData;

 
 

+    (void) Create(bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
+}

 
 

+wxBitmap::~wxBitmap()
+{
+}

 
 

-//-----------------------------------------------------------------------------
-// wxImage conversion routines
-//-----------------------------------------------------------------------------
+int wxBitmap::GetHeight() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
 

-/*
+    return M_BMPDATA->m_height;
+}

 
 

-Date: Wed, 05 Jan 2000 11:45:40 +0100
-From: Frits Boel <boel@niob.knaw.nl>
-To: julian.smart@ukonline.co.uk
-Subject: Patch for Motif ConvertToBitmap
+int wxBitmap::GetWidth() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
 

-Hi Julian,
+    return M_BMPDATA->m_width;
+}

 
 

-I've been working on a wxWin application for image processing. From the
-beginning, I was surprised by the (lack of) speed of ConvertToBitmap,
-till I looked in the source code of image.cpp. I saw that converting a
-wxImage to a bitmap with 8-bit pixels is done with comparing every pixel
-to the 256 colors of the palet. A very time-consuming piece of code!
+int wxBitmap::GetDepth() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
 

-Because I wanted a faster application, I've made a 'patch' for this. In
-short: every pixel of the image is compared to a sorted list with
-colors. If the color is found in the list, the palette entry is
-returned; if the color is not found, the color palette is searched and
-then the palette entry is returned and the color added to the sorted
-list.
+    return M_BMPDATA->m_bpp;
+}

 
 

-Maybe there is another method for this, namely changing the palette
-itself (if the colors are known, as is the case with tiffs with a
-colormap). I did not look at this, maybe someone else did?
+wxMask *wxBitmap::GetMask() const
+{
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );

 
 

-The code of the patch is attached, have a look on it, and maybe you will
-ship it with the next release of wxMotif?
+    return M_BMPDATA->m_mask;
+}

 
 

-Regards,
+void wxBitmap::SetMask( wxMask *mask )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );

 
 

-Frits Boel
-Software engineer at Hubrecht Laboratory, The Netherlands.
+    AllocExclusive();
+    if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;

 
 

-*/
+    M_BMPDATA->m_mask = mask;
+}

 
 

-class wxSearchColor
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)

 {
 {

-public:
-  wxSearchColor( void );
-  wxSearchColor( int size, XColor *colors );
-  ~wxSearchColor( void );
+    *this = icon;
+    return true;
+}

 
 

-  int SearchColor( int r, int g, int b );
-private:
-  int AddColor( unsigned int value, int pos );
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
+{
+    wxCHECK_MSG( IsOk() &&
+                 (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") );

 
 

-  int          size;
-  XColor       *colors;
-  unsigned int *color;
-  int          *entry;
+    wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
+    wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );

 
 

-  int bottom;
-  int top;
-};
+    if( GetMask() )
+    {
+        wxMask* mask = new wxMask();
+        mask->SetDisplay( GetMask()->GetDisplay() );
+        mask->SetBitmap( wxGetSubPixmap( GetMask()->GetDisplay(),
+                                         GetMask()->GetBitmap(),
+                                         rect.x, rect.y,
+                                         rect.width, rect.height,
+                                         1 ) );
+
+        ret.SetMask( mask );
+    }
+
+    if( GetPixmap() )
+    {
+        ret.SetPixmap( wxGetSubPixmap( GetDisplay(),
+                                       GetPixmap(),
+                                       rect.x, rect.y,
+                                       rect.width, rect.height,
+                                       M_BMPDATA->m_bpp ) );
+    }

 
 

-wxSearchColor::wxSearchColor( void )
+    if( GetBitmap() )
+    {
+        ret.SetBitmap( wxGetSubPixmap( GetDisplay(),
+                                       GetBitmap(),
+                                       rect.x, rect.y,
+                                       rect.width, rect.height,
+                                       1 ) );
+    }
+
+    return ret;
+}
+
+bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type,
+                         const wxPalette *palette ) const

 {
 {

-  size   = 0;
-  colors = (XColor*) NULL;
-  color  = (unsigned int *) NULL;
-  entry  = (int*) NULL;
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
+
+    wxBitmapHandler *handler = FindHandler(type);
+
+    // Try to save the bitmap via wxImage handlers:
+    if (handler == NULL)
+    {
+        wxImage image(this->ConvertToImage());
+        if (image.IsOk()) return image.SaveFile( name, type );
+
+        return false;
+    }

 
 

-  bottom = 0;
-  top    = 0;
+    return handler->SaveFile(this, name, type, palette);

 }
 
 }
 

-wxSearchColor::wxSearchColor( int size_, XColor *colors_ )
+bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )

 {
 {

-    int i;
-    size   = size_;
-    colors = colors_;
-    color  = new unsigned int[size];
-    entry  = new int         [size];
-
-    for (i = 0; i < size; i++ ) {
-        entry[i] = -1;
+    UnRef();
+
+    if (!wxFileExists(name)) return false;
+
+    wxBitmapHandler *handler = FindHandler(type);
+
+    if (handler == NULL)
+    {
+        wxImage image;
+        if (!image.LoadFile( name, type ))
+            return false;
+
+        if (image.IsOk())
+        {
+            *this = wxBitmap(image);
+            return true;
+        }
+        else return false;

     }
 
     }
 

-    bottom = top = ( size >> 1 );
+    return handler->LoadFile(this, name, type, -1, -1);

 }
 
 }
 

-wxSearchColor::~wxSearchColor( void )
+void wxBitmap::SetPalette(const wxPalette& palette)

 {
 {

-  if ( color ) delete color;
-  if ( entry ) delete entry;
+    wxCHECK_RET(IsOk(), wxT("invalid bitmap"));
+    wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8,
+                wxT("cannot set palette for bitmap of this depth"));
+
+    AllocExclusive();
+    wxDELETE(M_BMPDATA->m_palette);
+
+    if (!palette.IsOk()) return;
+
+    M_BMPDATA->m_palette = new wxPalette(palette);

 }
 
 }
 

-int wxSearchColor::SearchColor( int r, int g, int b )
+wxPalette *wxBitmap::GetPalette() const

 {
 {

-  unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b;
-  int          begin = bottom;
-  int          end   = top;
-  int          middle = 0;
+    if (!IsOk()) return NULL;

 
 

-  while ( begin <= end ) {
+    return M_BMPDATA->m_palette;
+}

 
 

-    middle = ( begin + end ) >> 1;
+void wxBitmap::SetHeight( int height )
+{
+    AllocExclusive();

 
 

-    if ( value == color[middle] ) {
-      return( entry[middle] );
-    } else if ( value < color[middle] ) {
-      end = middle - 1;
-    } else {
-      begin = middle + 1;
-    }
+    M_BMPDATA->m_height = height;
+}

 
 

-  }
+void wxBitmap::SetWidth( int width )
+{
+    AllocExclusive();

 
 

-  return AddColor( value, middle );
+    M_BMPDATA->m_width = width;

 }
 
 }
 

-int wxSearchColor::AddColor( unsigned int value, int pos )
+void wxBitmap::SetDepth( int depth )

 {
 {

-  int i;
-  int pixel = -1;
-  int max = 3 * (65536);
-  for ( i = 0; i < 256; i++ ) {
-    int rdiff = ((value >> 8) & 0xFF00 ) - colors[i].red;
-    int gdiff = ((value     ) & 0xFF00 ) - colors[i].green;
-    int bdiff = ((value << 8) & 0xFF00 ) - colors[i].blue;
-    int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
-    if (sum < max) { pixel = i; max = sum; }
-  }
-
-  if ( entry[pos] < 0 ) {
-    color[pos] = value;
-    entry[pos] = pixel;
-  } else if ( value < color[pos] ) {
-
-    if ( bottom > 0 ) {
-      for ( i = bottom; i < pos; i++ ) {
-        color[i-1] = color[i];
-        entry[i-1] = entry[i];
-      }
-      bottom--;
-      color[pos-1] = value;
-      entry[pos-1] = pixel;
-    } else if ( top < size-1 ) {
-      for ( i = top; i >= pos; i-- ) {
-        color[i+1] = color[i];
-        entry[i+1] = entry[i];
-      }
-      top++;
-      color[pos] = value;
-      entry[pos] = pixel;
-    }
+    AllocExclusive();

 
 

-  } else {
-
-    if ( top < size-1 ) {
-      for ( i = top; i > pos; i-- ) {
-        color[i+1] = color[i];
-        entry[i+1] = entry[i];
-      }
-      top++;
-      color[pos+1] = value;
-      entry[pos+1] = pixel;
-    } else if ( bottom > 0 ) {
-      for ( i = bottom; i < pos; i++ ) {
-        color[i-1] = color[i];
-        entry[i-1] = entry[i];
-      }
-      bottom--;
-      color[pos] = value;
-      entry[pos] = pixel;
-    }
+    M_BMPDATA->m_bpp = depth;
+}

 
 

-  }
+void wxBitmap::SetPixmap( WXPixmap pixmap )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();

 
 

-  return( pixel );
+    M_BMPDATA->m_pixmap = (Pixmap)pixmap;

 }
 
 }
 

+void wxBitmap::SetBitmap( WXPixmap bitmap )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();

 
 

-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+    M_BMPDATA->m_bitmap = (Pixmap)bitmap;
+}
+
+WXPixmap wxBitmap::GetPixmap() const

 {
 {

-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
-    wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") )
+    wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") );

 
 

-    m_refData = new wxBitmapRefData();
+    return (WXPixmap)M_BMPDATA->m_pixmap;
+}

 
 

-    int width = image.GetWidth();
-    int height = image.GetHeight();
+WXPixmap wxBitmap::GetBitmap() const
+{
+    wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") );

 
 

-    SetHeight( height );
-    SetWidth( width );
+    return (WXPixmap)M_BMPDATA->m_bitmap;
+}

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
-    int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) );
+WXPixmap wxBitmap::GetDrawable() const
+{
+    wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") );

 
 

-    // Create image
+    return (WXPixmap)(M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap
+                                            : M_BMPDATA->m_pixmap);
+}

 
 

-    XImage *data_image = XCreateImage( dpy, vis, bpp, ZPixmap, 0, 0, width, height, 32, 0 );
-    data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height );
+WXDisplay *wxBitmap::GetDisplay() const
+{
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );

 
 

-    Create( width, height, bpp );
+    return M_BMPDATA->m_display;
+}

 
 

-    // Create mask
+#if wxUSE_NANOX
+// Copy from the drawable to the wxImage
+bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image)
+{
+    GR_SCREEN_INFO sinfo;
+    int x, y;
+    GR_PIXELVAL *pixels;
+    GR_PALETTE* palette = NULL;
+    unsigned char rgb[3], *pp;

 
 

-    XImage *mask_image = (XImage*) NULL;
-    if (image.HasMask())
-    {
-        mask_image = XCreateImage( dpy, vis, 1, ZPixmap, 0, 0, width, height, 32, 0 );
-        mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height );
-    }
+    GrGetScreenInfo(&sinfo);

 
 

-    // Retrieve depth info
+    if (sinfo.pixtype == MWPF_PALETTE) {
+        if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) {
+            return false;
+        }
+        GrGetSystemPalette(palette);
+    }

 
 

-    XVisualInfo vinfo_template;
-    XVisualInfo *vi;
+    if(!(pixels = (GR_PIXELVAL*) malloc(sizeof(GR_PIXELVAL) * width * height)))
+    {
+        return false;
+    }

 
 

-    vinfo_template.visual = vis;
-    vinfo_template.visualid = XVisualIDFromVisual( vis );
-    vinfo_template.depth = bpp;
-    int nitem = 0;
+    image.Create(width, height);
+
+    GrReadArea(drawable, srcX, srcY, width, height,
+            pixels);
+
+
+    for(x = 0; x < sinfo.cols; x++) {
+
+        pp = (unsigned char *)pixels +
+            ((x + (y * sinfo.cols)) *
+             sizeof(GR_PIXELVAL));
+
+        switch(sinfo.pixtype) {
+            /* FIXME: These may need modifying on big endian. */
+            case MWPF_TRUECOLOR0888:
+            case MWPF_TRUECOLOR888:
+                rgb[0] = pp[2];
+                rgb[1] = pp[1];
+                rgb[2] = pp[0];
+                break;
+            case MWPF_PALETTE:
+                rgb[0] = palette->palette[pp[0]].r;
+                rgb[1] = palette->palette[pp[0]].g;
+                rgb[2] = palette->palette[pp[0]].b;
+                break;
+            case MWPF_TRUECOLOR565:
+                rgb[0] = pp[1] & 0xf8;
+                rgb[1] = ((pp[1] & 0x07) << 5) |
+                    ((pp[0] & 0xe0) >> 3);
+                rgb[2] = (pp[0] & 0x1f) << 3;
+                break;
+            case MWPF_TRUECOLOR555:
+                rgb[0] = (pp[1] & 0x7c) << 1;
+                rgb[1] = ((pp[1] & 0x03) << 6) |
+                    ((pp[0] & 0xe0) >> 2);
+                rgb[2] = (pp[0] & 0x1f) << 3;
+                break;
+            case MWPF_TRUECOLOR332:
+                rgb[0] = pp[0] & 0xe0;
+                rgb[1] = (pp[0] & 0x1c) << 3;
+                rgb[2] = (pp[0] & 0x03) << 6;
+                break;
+            default:
+                fprintf(stderr, "Unsupported pixel "
+                        "format\n");
+                return 1;
+        }

 
 

-    vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
+        image.SetRGB(x, y, rgb[0], rgb[1], rgb[2]);

 
 

-    wxCHECK_MSG( vi, FALSE, wxT("no visual") );
+    }

 
 

-    XFree( vi );
+    free(pixels);
+    if(palette) free(palette);

 
 

-    if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
+    return true;
+}

 
 

-    // Render
+#if 0
+int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixel,
+    unsigned char* red, unsigned char* green, unsigned char* blue)
+{
+    unsigned char rgb[3], *pp;

 
 

-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
+    pp = (unsigned char*) & pixel ;

 
 

-    if (bpp >= 24)
+    switch (sinfo.pixtype)

     {
     {

-        if ((vi->red_mask > vi->green_mask) && (vi->green_mask > vi->blue_mask))      b_o = RGB;
-        else if ((vi->red_mask > vi->blue_mask) && (vi->blue_mask > vi->green_mask))  b_o = RGB;
-        else if ((vi->blue_mask > vi->red_mask) && (vi->red_mask > vi->green_mask))   b_o = BRG;
-        else if ((vi->blue_mask > vi->green_mask) && (vi->green_mask > vi->red_mask)) b_o = BGR;
-        else if ((vi->green_mask > vi->red_mask) && (vi->red_mask > vi->blue_mask))   b_o = GRB;
-        else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask))  b_o = GBR;
+        /* FIXME: These may need modifying on big endian. */
+        case MWPF_TRUECOLOR0888:
+        case MWPF_TRUECOLOR888:
+            rgb[0] = pp[2];
+            rgb[1] = pp[1];
+            rgb[2] = pp[0];
+            break;
+        case MWPF_PALETTE:
+            rgb[0] = palette->palette[pp[0]].r;
+            rgb[1] = palette->palette[pp[0]].g;
+            rgb[2] = palette->palette[pp[0]].b;
+            break;
+        case MWPF_TRUECOLOR565:
+            rgb[0] = pp[1] & 0xf8;
+            rgb[1] = ((pp[1] & 0x07) << 5) |
+                ((pp[0] & 0xe0) >> 3);
+            rgb[2] = (pp[0] & 0x1f) << 3;
+            break;
+        case MWPF_TRUECOLOR555:
+            rgb[0] = (pp[1] & 0x7c) << 1;
+            rgb[1] = ((pp[1] & 0x03) << 6) |
+                ((pp[0] & 0xe0) >> 2);
+            rgb[2] = (pp[0] & 0x1f) << 3;
+            break;
+        case MWPF_TRUECOLOR332:
+            rgb[0] = pp[0] & 0xe0;
+            rgb[1] = (pp[0] & 0x1c) << 3;
+            rgb[2] = (pp[0] & 0x03) << 6;
+            break;
+        default:
+            fprintf(stderr, "Unsupported pixel format\n");
+            return 0;

     }
 
     }
 

-    int r_mask = image.GetMaskRed();
-    int g_mask = image.GetMaskGreen();
-    int b_mask = image.GetMaskBlue();

 
 

-    XColor colors[256];
-    if (bpp == 8)
-    {
-        Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy );
+    *(red) = rgb[0];
+    *(green) = rgb[1];
+    *(blue) = rgb[2];
+    return 1;
+}
+#endif

 
 

-        for (int i = 0; i < 256; i++) colors[i].pixel = i;
-        XQueryColors( dpy, cmap, colors, 256 );
-    }
+#endif
+  // wxUSE_NANOX

 
 

-    wxSearchColor scolor( 256, colors );
-    unsigned char* data = image.GetData();
+// ============================================================================
+// Bitmap handlers
+// ============================================================================

 
 

-    bool hasMask = image.HasMask();
+#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())

 
 

-    int index = 0;
-    for (int y = 0; y < height; y++)
+#if wxUSE_XPM
+
+#if wxHAVE_LIB_XPM || wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// wxXPMFileHandler
+// ----------------------------------------------------------------------------
+
+class wxXPMFileHandler : public wxBitmapHandler
+{
+public:
+    wxXPMFileHandler()

     {
     {

-        for (int x = 0; x < width; x++)
-        {
-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
+        SetName( wxT("XPM file") );
+        SetExtension( wxT("xpm") );
+        SetType( wxBITMAP_TYPE_XPM );
+    };

 
 

-            if (hasMask)
-            {
-              if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                XPutPixel( mask_image, x, y, 0 );
-              else
-                XPutPixel( mask_image, x, y, 1 );
-            }
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name,
+                          wxBitmapType flags,
+                          int desiredWidth, int desiredHeight);

 
 

-            switch (bpp)
-            {
-            case 8:
-                {
-#if 0 // Old, slower code
-                    int pixel = -1;
-                    /*
-                    if (wxTheApp->m_colorCube)
-                    {
-                    pixel = wxTheApp->m_colorCube
-                    [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                    }
-                    else
-                    {
-                    */
-                    int max = 3 * (65536);
-                    for (int i = 0; i < 256; i++)
-                    {
-                        int rdiff = (r << 8) - colors[i].red;
-                        int gdiff = (g << 8) - colors[i].green;
-                        int bdiff = (b << 8) - colors[i].blue;
-                        int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
-                        if (sum < max) { pixel = i; max = sum; }
-                    }
-                    /*
-                    }
-                    */
-#endif
+    virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
+                          wxBitmapType type,
+                          const wxPalette *palette = NULL) const;

 
 

-                    // And this is all to get the 'right' color...
-                    int pixel = scolor.SearchColor( r, g, b );
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 15:
-                {
-                    int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 16:
-                {
-                    int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 32:
-            case 24:
-                {
-                    int pixel = 0;
-                    switch (b_o)
-                    {
-                    case RGB: pixel = (r << 16) | (g << 8) | b; break;
-                    case RBG: pixel = (r << 16) | (b << 8) | g; break;
-                    case BRG: pixel = (b << 16) | (r << 8) | g; break;
-                    case BGR: pixel = (b << 16) | (g << 8) | r; break;
-                    case GRB: pixel = (g << 16) | (r << 8) | b; break;
-                    case GBR: pixel = (g << 16) | (b << 8) | r; break;
-                    }
-                    XPutPixel( data_image, x, y, pixel );
-                }
-            default: break;
-            }
-        } // for
-    }  // for
+    virtual bool Create(wxBitmap *WXUNUSED(bitmap),
+                        const void* WXUNUSED(data),
+                        wxBitmapType WXUNUSED(flags),
+                        int WXUNUSED(width),
+                        int WXUNUSED(height),
+                        int WXUNUSED(depth) = 1)
+        { return false; }
+
+    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
+};

 
 

-    // Blit picture
+IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)

 
 

-    XGCValues gcvalues;
-    gcvalues.foreground = BlackPixel( dpy, DefaultScreen( dpy ) );
-    GC gc = XCreateGC( dpy, RootWindow ( dpy, DefaultScreen(dpy) ), GCForeground, &gcvalues );
-    XPutImage( dpy, (Drawable)GetPixmap(), gc, data_image, 0, 0, 0, 0, width, height );
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
+                                const wxString& name,
+                                wxBitmapType WXUNUSED(flags),
+                                int WXUNUSED(desiredWidth),
+                                int WXUNUSED(desiredHeight))
+{
+#if wxHAVE_LIB_XPM
+    if (!bitmap->GetRefData())
+        bitmap->SetRefData( new wxBitmapRefData() );

 
 

-    XDestroyImage( data_image );
-    XFreeGC( dpy, gc );
+    M_BMPHANDLERDATA->m_display = wxGlobalDisplay();

 
 

-    // Blit mask
-    if (image.HasMask())
+    Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display;
+
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );
+
+    int bpp = DefaultDepth( xdisplay, xscreen );
+
+    XpmAttributes xpmAttr;
+    xpmAttr.valuemask = XpmReturnInfos;    // nothing yet, but get infos back
+
+    Pixmap pixmap;
+    Pixmap mask = 0;
+
+    int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
+                                           (char*) ((const char*) name.c_str()),
+                                           &pixmap, &mask, &xpmAttr);
+
+    if (ErrorStatus == XpmSuccess)

     {
     {

-        wxBitmap maskBitmap(width, height, 1);
+        M_BMPHANDLERDATA->m_width = xpmAttr.width;
+        M_BMPHANDLERDATA->m_height = xpmAttr.height;

 
 

-        GC gcMask = XCreateGC( dpy, (Pixmap) maskBitmap.GetPixmap(), (XtGCMask) 0, (XGCValues*)NULL );
-        XPutImage( dpy, (Drawable)maskBitmap.GetPixmap(), gcMask, mask_image, 0, 0, 0, 0, width, height );
+        M_BMPHANDLERDATA->m_bpp = bpp;  // mono as well?

 
 

-        XDestroyImage( mask_image );
-        XFreeGC( dpy, gcMask );
+        XpmFreeAttributes(&xpmAttr);

 
 

-        wxMask* mask = new wxMask;
-        mask->SetPixmap(maskBitmap.GetPixmap());
+        M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap;

 
 

-        SetMask(mask);
+        if (mask)
+        {
+            M_BMPHANDLERDATA->m_mask = new wxMask;
+            M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask );
+            M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay );
+        }
+    }
+    else
+    {
+        UnRef();

 
 

-        maskBitmap.SetPixmapNull();
+        return false;

     }
 
     }
 

+    return true;
+#elif wxUSE_STREAMS
+    wxXPMDecoder decoder;
+    wxFileInputStream stream(name);
+    if (stream.IsOk())
+    {
+        wxImage image(decoder.ReadFile(stream));
+        return image.IsOk() && bitmap->CreateFromImage(image);
+    }

 
 

-    return TRUE;
+    return false;
+#else // !wxHAVE_LIB_XPM && !wxUSE_STREAMS
+    return false;
+#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS

 }
 
 }
 

-wxImage wxBitmap::ConvertToImage() const
+bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap,
+                                const wxString& name,
+                                wxBitmapType type,
+                                const wxPalette *WXUNUSED(palette)) const

 {
 {

-    wxImage image;
-    
-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxImage image(bitmap->ConvertToImage());
+    if (image.IsOk())
+        return image.SaveFile( name, type );

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
-    int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) );
-
-    XImage *ximage = XGetImage( dpy,
-        (Drawable)GetPixmap(),
-        0, 0,
-        GetWidth(), GetHeight(),
-        AllPlanes, ZPixmap );
+    return false;
+}

 
 

-    wxCHECK_MSG( ximage, wxNullImage, wxT("couldn't create image") );
+#endif // wxHAVE_LIB_XPM || wxUSE_STREAMS

 
 

-    image.Create( GetWidth(), GetHeight() );
-    char unsigned *data = image.GetData();
+// ----------------------------------------------------------------------------
+// wxXPMDataHandler
+// ----------------------------------------------------------------------------

 
 

-    if (!data)
+class wxXPMDataHandler : public wxBitmapHandler
+{
+    DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
+public:
+    wxXPMDataHandler()

     {
     {

-        XDestroyImage( ximage );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return wxNullImage;
-    }
+        SetName( wxT("XPM data") );
+        SetExtension( wxT("xpm") );
+        SetType( wxBITMAP_TYPE_XPM_DATA );
+    };

 
 

-    /*
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (GetMask())
-    {
-    gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
-    0, 0,
-    GetWidth(), GetHeight() );
+    virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
+                          const wxString& WXUNUSED(name),
+                          wxBitmapType WXUNUSED(flags),
+                          int WXUNUSED(desiredWidth),
+                          int WXUNUSED(desiredHeight))
+        { return false; }
+
+    virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
+                          const wxString& WXUNUSED(name),
+                          wxBitmapType WXUNUSED(type),
+                          const wxPalette *WXUNUSED(palette) = NULL) const
+        { return false; }
+
+    virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType flags,
+                        int width, int height, int depth = 1);
+};

 
 

-      image.SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-      }
-    */
+IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)

 
 

-    // Retrieve depth info
+bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
+                              wxBitmapType WXUNUSED(flags),
+                              int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
+{
+#if wxHAVE_LIB_XPM
+    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );

 
 

-    XVisualInfo vinfo_template;
-    XVisualInfo *vi;
+    if (!bitmap->GetRefData())
+        bitmap->SetRefData( new wxBitmapRefData() );

 
 

-    vinfo_template.visual = vis;
-    vinfo_template.visualid = XVisualIDFromVisual( vis );
-    vinfo_template.depth = bpp;
-    int nitem = 0;
+    M_BMPHANDLERDATA->m_display = wxGlobalDisplay();

 
 

-    vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
+    Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display;

 
 

-    wxCHECK_MSG( vi, wxNullImage, wxT("no visual") );
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );

 
 

-    if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
+    int bpp = DefaultDepth( xdisplay, xscreen );

 
 

-    XFree( vi );
+    XpmAttributes xpmAttr;
+    xpmAttr.valuemask = XpmReturnInfos;    // nothing yet, but get infos back

 
 

-    XColor colors[256];
-    if (bpp == 8)
-    {
-        Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy );
+    Pixmap pixmap = 0;
+    Pixmap mask = 0;

 
 

-        for (int i = 0; i < 256; i++) colors[i].pixel = i;
-        XQueryColors( dpy, cmap, colors, 256 );
-    }
+    int ErrorStatus = XpmCreatePixmapFromData( xdisplay, xroot, (char**) bits,
+                                               &pixmap, &mask, &xpmAttr );

 
 

-    long pos = 0;
-    for (int j = 0; j < GetHeight(); j++)
+    if (ErrorStatus == XpmSuccess)

     {
     {

-        for (int i = 0; i < GetWidth(); i++)
-        {
-            int pixel = XGetPixel( ximage, i, j );
-            if (bpp <= 8)
-            {
-                data[pos] = colors[pixel].red >> 8;
-                data[pos+1] = colors[pixel].green >> 8;
-                data[pos+2] = colors[pixel].blue >> 8;
-            } else if (bpp == 15)
-            {
-                data[pos] = (pixel >> 7) & 0xf8;
-                data[pos+1] = (pixel >> 2) & 0xf8;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else if (bpp == 16)
-            {
-                data[pos] = (pixel >> 8) & 0xf8;
-                data[pos+1] = (pixel >> 3) & 0xfc;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else
-            {
-                data[pos] = (pixel >> 16) & 0xff;
-                data[pos+1] = (pixel >> 8) & 0xff;
-                data[pos+2] = pixel & 0xff;
-            }
+        M_BMPHANDLERDATA->m_width = xpmAttr.width;
+        M_BMPHANDLERDATA->m_height = xpmAttr.height;

 
 

-            /*
-            if (gdk_image_mask)
-            {
-            int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-            if (mask_pixel == 0)
-            {
-            data[pos] = 16;
-            data[pos+1] = 16;
-            data[pos+2] = 16;
-            }
-            }
-            */
+        M_BMPHANDLERDATA->m_bpp = bpp;  // mono as well?

 
 

-            pos += 3;
+#if wxDEBUG_LEVEL
+        unsigned int depthRet;
+        int xRet, yRet;
+        unsigned int widthRet, heightRet, borderWidthRet;
+        XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet,
+            &widthRet, &heightRet, &borderWidthRet, &depthRet);
+
+        wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") );
+#endif // wxDEBUG_LEVEL
+
+        XpmFreeAttributes(&xpmAttr);
+
+        M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap;
+
+        if (mask)
+        {
+            M_BMPHANDLERDATA->m_mask = new wxMask;
+            M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask );
+            M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay );

         }
         }

+        return true;

     }
     }

+    else
+    {
+        bitmap->UnRef();

 
 

-    XDestroyImage( ximage );
-    /*
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-    */
+        return false;
+    }
+#else // !wxHAVE_LIB_XPM
+    wxXPMDecoder decoder;
+    wxImage image(decoder.ReadData((const char **)bits));
+    return image.IsOk() && bitmap->CreateFromImage(image);
+#endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM
+}

 
 

-    return image;
+#endif // wxUSE_XPM
+
+// ----------------------------------------------------------------------------
+// wxXBMDataHandler
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler
+{
+    DECLARE_DYNAMIC_CLASS(wxXBMDataHandler)
+public:
+    inline wxXBMDataHandler()
+    {
+        SetName( wxT("XBM data") );
+        SetExtension( wxT("xbm") );
+        SetType( wxBITMAP_TYPE_XBM_DATA );
+    };
+
+    virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
+                          const wxString& WXUNUSED(name),
+                          wxBitmapType WXUNUSED(flags),
+                          int WXUNUSED(desiredWidth),
+                          int WXUNUSED(desiredHeight))
+        { return false; }
+
+    virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
+                          const wxString& WXUNUSED(name),
+                          wxBitmapType WXUNUSED(type),
+                          const wxPalette *WXUNUSED(palette) = NULL) const
+        { return false; }
+
+    virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType type,
+                        int width, int height, int depth = 1);
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
+
+bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits,
+                               wxBitmapType WXUNUSED(type),
+                               int width, int height, int WXUNUSED(depth))
+{
+#if !wxUSE_NANOX
+    if (!bitmap->GetRefData())
+        bitmap->SetRefData( new wxBitmapRefData() );
+
+    M_BMPHANDLERDATA->m_display = wxGlobalDisplay();
+
+    Display *xdisplay = (Display*) M_BMPHANDLERDATA->m_display;
+
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );
+
+    M_BMPHANDLERDATA->m_mask = NULL;
+    M_BMPHANDLERDATA->m_bitmap =
+        XCreateBitmapFromData(xdisplay, xroot,
+                              (char *) bits, width, height );
+    M_BMPHANDLERDATA->m_width = width;
+    M_BMPHANDLERDATA->m_height = height;
+    M_BMPHANDLERDATA->m_bpp = 1;
+
+    return true;
+#else
+   wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, false,
+                 wxT("couldn't create bitmap") );
+#endif
+}
+
+void wxBitmap::InitStandardHandlers()
+{
+    AddHandler(new wxXBMDataHandler);
+#if wxUSE_XPM
+#if wxHAVE_LIB_XPM || wxUSE_STREAMS
+    AddHandler(new wxXPMFileHandler);
+#endif
+    AddHandler(new wxXPMDataHandler);
+#endif

 }
 }