Fixed wxRichTextCtrl base class

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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index ae4c2e3f12cd39fd2c8b45756ebce36de95e4b6e..be6e240a156fded5939edca5b3cd026839cfb609 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -17,12 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

-#endif
-
-#include "wx/icon.h"
-#include "wx/image.h"
-#if wxUSE_NANOX
-#include "wx/dcmemory.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"


@@ -44,7 +42,6 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width,
 #include "wx/wfstream.h"
 #endif
 #endif
 #include "wx/wfstream.h"
 #endif
 #endif

-#include "wx/math.h"

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -230,15 +227,21 @@ bool wxMask::Create( const wxBitmap& bitmap )
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData : public wxGDIRefData

 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

-    ~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; }

 
 

-    WXPixmap        m_pixmap;
-    WXPixmap        m_bitmap;
-    WXDisplay      *m_display;
+    Pixmap          m_pixmap;
+    Pixmap          m_bitmap;
+    Display        *m_display;

     wxMask         *m_mask;
     int             m_width;
     int             m_height;
     wxMask         *m_mask;
     int             m_width;
     int             m_height;


@@ -248,22 +251,67 @@ public:
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

-    m_pixmap = NULL;
-    m_bitmap = NULL;
+    m_pixmap = 0;
+    m_bitmap = 0;

     m_display = NULL;
     m_display = NULL;

-    m_mask = (wxMask *) NULL;
+    m_mask = NULL;

     m_width = 0;
     m_height = 0;
     m_bpp = 0;
     m_width = 0;
     m_height = 0;
     m_bpp = 0;

-    m_palette = (wxPalette *) NULL;
+    m_palette = NULL;
+}
+
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
+{
+    m_pixmap = 0;
+    m_bitmap = 0;
+    m_display = data.m_display;
+    m_mask = NULL; // FIXME: should copy
+    m_palette = NULL; // FIXME: should copy
+
+    Create(data.m_width, data.m_height, data.m_bpp);
+}
+
+bool wxBitmapRefData::Create(int width, int height, int depth)
+{
+    m_width = width;
+    m_height = height;
+    m_bpp = depth;
+
+    m_display = wxGlobalDisplay();
+
+    wxCHECK_MSG( m_display, false, wxT("No display") );
+
+    int xscreen = DefaultScreen(m_display);
+    int bpp = DefaultDepth(m_display, xscreen);
+    if ( depth == -1 )
+        depth = bpp;
+
+    wxCHECK_MSG( (depth == bpp) || (depth == 1), false,
+                 wxT("invalid bitmap depth") );
+
+#if wxUSE_NANOX
+    m_pixmap = (WXPixmap) GrNewPixmap(width, height, NULL);
+#else // !wxUSE_NANOX
+    Window xroot = RootWindow(m_display, xscreen);
+
+    *(depth == 1 ? &m_bitmap : &m_pixmap) = 
+        XCreatePixmap(m_display, xroot, width, height, depth);
+#endif // wxUSE_NANOX/!wxUSE_NANOX
+
+    wxCHECK_MSG( m_pixmap || m_bitmap, false, wxT("Bitmap creation failed") );
+
+    return true;

 }
 
 wxBitmapRefData::~wxBitmapRefData()
 {
 }
 
 wxBitmapRefData::~wxBitmapRefData()
 {

-    if (m_pixmap) XFreePixmap( (Display*) m_display, (Pixmap) m_pixmap );
-    if (m_bitmap) XFreePixmap( (Display*) m_display, (Pixmap) m_bitmap );
-    if (m_mask) delete m_mask;
-    if (m_palette) delete m_palette;
+    if (m_pixmap)
+       XFreePixmap(m_display, m_pixmap);
+    if (m_bitmap)
+       XFreePixmap(m_display, m_bitmap);
+    delete m_mask;
+    delete m_palette;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -320,50 +368,10 @@ bool wxBitmap::Create( int width, int height, int depth )
 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();
 

-    M_BMPDATA->m_display = wxGlobalDisplay();
-
-    wxASSERT_MSG( M_BMPDATA->m_display, wxT("No display") );
-
-    int xscreen = DefaultScreen( (Display*) M_BMPDATA->m_display );
-    Window xroot = RootWindow( (Display*) M_BMPDATA->m_display, xscreen );
-
-    int bpp = DefaultDepth( (Display*) M_BMPDATA->m_display, xscreen );
-    if (depth == -1) depth = bpp;
-
-    wxCHECK_MSG( (depth == bpp) ||
-                 (depth == 1), false, wxT("invalid bitmap depth") );
-
-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_width = width;
-    M_BMPDATA->m_height = height;
-
-#if wxUSE_NANOX
-    M_BMPDATA->m_pixmap = (WXPixmap) GrNewPixmap(width, height, NULL);
-    M_BMPDATA->m_bpp = bpp;
-
-    wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("Bitmap creation failed") );
-#else
-    if (depth == 1)
-    {
-        M_BMPDATA->m_bitmap = (WXPixmap) XCreatePixmap( (Display*) M_BMPDATA->m_display, xroot, width, height, 1 );
-
-        wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("Bitmap creation failed") );
-
-        M_BMPDATA->m_bpp = 1;
-    }
-    else
-    {
-        M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( (Display*) M_BMPDATA->m_display, xroot, width, height, depth );
-
-        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("Pixmap creation failed") );
-
-        M_BMPDATA->m_bpp = depth;
-    }
-#endif
-    return Ok();
+    return M_BMPDATA->Create(width, height, depth);

 }
 
 }
 

-bool wxBitmap::Create(void *data, wxBitmapType type,
+bool wxBitmap::Create(const void* data, wxBitmapType type,

                       int width, int height, int depth)
 {
     UnRef();
                       int width, int height, int depth)
 {
     UnRef();


@@ -390,13 +398,12 @@ bool wxBitmap::Create(WXPixmap pixmap)
 
     // make a copy of the Pixmap
     Window root;
 
     // make a copy of the Pixmap
     Window root;

-    Pixmap copy;

     int x, y;
     unsigned width, height, border, depth;
 
     XGetGeometry( xdisplay, (Drawable)xpixmap, &root, &x, &y,
                   &width, &height, &border, &depth );
     int x, y;
     unsigned width, height, border, depth;
 
     XGetGeometry( xdisplay, (Drawable)xpixmap, &root, &x, &y,
                   &width, &height, &border, &depth );

-    copy = XCreatePixmap( xdisplay, xroot, width, height, depth );
+    Pixmap copy = XCreatePixmap( xdisplay, xroot, width, height, depth );

 
     GC gc = XCreateGC( xdisplay, copy, 0, NULL );
     XCopyArea( xdisplay, xpixmap, copy, gc, 0, 0, width, height, 0, 0 );
 
     GC gc = XCreateGC( xdisplay, copy, 0, NULL );
     XCopyArea( xdisplay, xpixmap, copy, gc, 0, 0, width, height, 0, 0 );


@@ -406,11 +413,11 @@ bool wxBitmap::Create(WXPixmap pixmap)
     wxBitmapRefData* ref = new wxBitmapRefData();
 
     if( depth == 1 )
     wxBitmapRefData* ref = new wxBitmapRefData();
 
     if( depth == 1 )

-        ref->m_bitmap = (WXPixmap)copy;
+        ref->m_bitmap = copy;

     else
     else

-        ref->m_pixmap = (WXPixmap)copy;
+        ref->m_pixmap = copy;

 
 

-    ref->m_display = (WXDisplay*)xdisplay;
+    ref->m_display = xdisplay;

     ref->m_width = width;
     ref->m_height = height;
     ref->m_bpp = depth;
     ref->m_width = width;
     ref->m_height = height;
     ref->m_bpp = depth;


@@ -420,11 +427,19 @@ bool wxBitmap::Create(WXPixmap pixmap)
     return true;
 }
 
     return true;
 }
 

-bool wxBitmap::CreateFromXpm( const char **bits )
+wxBitmap::wxBitmap(const char* const* bits)
+{
+    Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
+
+wxGDIRefData *wxBitmap::CreateGDIRefData() const

 {
 {

-    wxCHECK_MSG( bits, false, wxT("NULL pointer in wxBitmap::CreateFromXpm") );
+    return new wxBitmapRefData;
+}

 
 

-    return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));

 }
 
 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 }
 
 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )


@@ -578,12 +593,13 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
             return false;
         }
 
             return false;
         }
 

-        M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, depth );
+        M_BMPDATA->m_pixmap = XCreatePixmap( xdisplay, xroot, width, height, depth );

 
 

-        // Create mask
+        // Create mask if necessary
+        const bool hasMask = image.HasMask();

 
 

-        XImage *mask_image = (XImage*) NULL;
-        if (image.HasMask())
+        XImage *mask_image = NULL;
+        if ( hasMask )

         {
             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 );
         {
             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 );


@@ -633,8 +649,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         unsigned char *colorCube =
             wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube;
 
         unsigned char *colorCube =
             wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube;
 

-        bool hasMask = image.HasMask();
-

         int index = 0;
         for (int y = 0; y < height; y++)
         {
         int index = 0;
         for (int y = 0; y < height; y++)
         {


@@ -915,28 +929,13 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int depth )
 {
     m_refData = new wxBitmapRefData;
 
 {
     m_refData = new wxBitmapRefData;
 

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

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

-bool wxBitmap::operator == ( const wxBitmap& bmp ) const
-{
-    return m_refData == bmp.m_refData;
-}
-
-bool wxBitmap::operator != ( const wxBitmap& bmp ) const
-{
-    return m_refData != bmp.m_refData;
-}
-
-bool wxBitmap::Ok() const
-{
-    return (m_refData != NULL);
-}
-

 int wxBitmap::GetHeight() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 int wxBitmap::GetHeight() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );


@@ -960,7 +959,7 @@ int wxBitmap::GetDepth() const
 
 wxMask *wxBitmap::GetMask() const
 {
 
 wxMask *wxBitmap::GetMask() const
 {

-    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_mask;
 }
 
     return M_BMPDATA->m_mask;
 }


@@ -969,6 +968,7 @@ void wxBitmap::SetMask( wxMask *mask )
 {
     wxCHECK_RET( Ok(), wxT("invalid bitmap") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid bitmap") );
 

+    AllocExclusive();

     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 
     M_BMPDATA->m_mask = mask;
     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 
     M_BMPDATA->m_mask = mask;


@@ -1075,6 +1075,7 @@ void wxBitmap::SetPalette(const wxPalette& palette)
     wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8,
                 wxT("cannot set palette for bitmap of this depth"));
 
     wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8,
                 wxT("cannot set palette for bitmap of this depth"));
 

+    AllocExclusive();

     delete M_BMPDATA->m_palette;
     M_BMPDATA->m_palette = NULL;
 
     delete M_BMPDATA->m_palette;
     M_BMPDATA->m_palette = NULL;
 


@@ -1085,28 +1086,28 @@ void wxBitmap::SetPalette(const wxPalette& palette)
 
 wxPalette *wxBitmap::GetPalette() const
 {
 
 wxPalette *wxBitmap::GetPalette() const
 {

-    if (!Ok()) return (wxPalette *) NULL;
+    if (!Ok()) return NULL;

 
     return M_BMPDATA->m_palette;
 }
 
 void wxBitmap::SetHeight( int height )
 {
 
     return M_BMPDATA->m_palette;
 }
 
 void wxBitmap::SetHeight( int height )
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
+    AllocExclusive();

 
     M_BMPDATA->m_height = height;
 }
 
 void wxBitmap::SetWidth( int width )
 {
 
     M_BMPDATA->m_height = height;
 }
 
 void wxBitmap::SetWidth( int width )
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
+    AllocExclusive();

 
     M_BMPDATA->m_width = width;
 }
 
 void wxBitmap::SetDepth( int depth )
 {
 
     M_BMPDATA->m_width = width;
 }
 
 void wxBitmap::SetDepth( int depth )
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
+    AllocExclusive();

 
     M_BMPDATA->m_bpp = depth;
 }
 
     M_BMPDATA->m_bpp = depth;
 }


@@ -1115,40 +1116,41 @@ void wxBitmap::SetPixmap( WXPixmap pixmap )
 {
     if (!m_refData) m_refData = new wxBitmapRefData();
 
 {
     if (!m_refData) m_refData = new wxBitmapRefData();
 

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

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

-    M_BMPDATA->m_bitmap = bitmap;
+    M_BMPDATA->m_bitmap = (Pixmap)bitmap;

 }
 
 WXPixmap wxBitmap::GetPixmap() const
 {
     wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
 
 }
 
 WXPixmap wxBitmap::GetPixmap() const
 {
     wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
 

-    return M_BMPDATA->m_pixmap;
+    return (WXPixmap)M_BMPDATA->m_pixmap;

 }
 
 WXPixmap wxBitmap::GetBitmap() const
 {
     wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
 
 }
 
 WXPixmap wxBitmap::GetBitmap() const
 {
     wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
 

-    return M_BMPDATA->m_bitmap;
+    return (WXPixmap)M_BMPDATA->m_bitmap;

 }
 
 WXPixmap wxBitmap::GetDrawable() const
 {
     wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
 
 }
 
 WXPixmap wxBitmap::GetDrawable() const
 {
     wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
 

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

 }
 
 WXDisplay *wxBitmap::GetDisplay() const
 {
 }
 
 WXDisplay *wxBitmap::GetDisplay() const
 {

-    wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_display;
 }
 
     return M_BMPDATA->m_display;
 }


@@ -1294,8 +1296,6 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe
 // Bitmap handlers
 // ============================================================================
 
 // Bitmap handlers
 // ============================================================================
 

-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
-

 #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 
 #if wxUSE_XPM
 #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 
 #if wxUSE_XPM


@@ -1323,7 +1323,7 @@ public:
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
                           int type, const wxPalette *palette = NULL);
 
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
                           int type, const wxPalette *palette = NULL);
 

-    virtual bool Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(flags),
+    virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data), long WXUNUSED(flags),

                         int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1)
         { return false; }
 };
                         int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1)
         { return false; }
 };


@@ -1354,7 +1354,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
     Pixmap mask = 0;
 
     int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
     Pixmap mask = 0;
 
     int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,

-                                           (char*) name.c_str(),
+                                           (char*) ((const char*) name.c_str()),

                                            &pixmap, &mask, &xpmAttr);
 
     if (ErrorStatus == XpmSuccess)
                                            &pixmap, &mask, &xpmAttr);
 
     if (ErrorStatus == XpmSuccess)


@@ -1366,7 +1366,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
 
         XpmFreeAttributes(&xpmAttr);
 
 
         XpmFreeAttributes(&xpmAttr);
 

-        M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap;
+        M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap;

 
         if (mask)
         {
 
         if (mask)
         {


@@ -1386,10 +1386,10 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
 #elif wxUSE_STREAMS
     wxXPMDecoder decoder;
     wxFileInputStream stream(name);
 #elif wxUSE_STREAMS
     wxXPMDecoder decoder;
     wxFileInputStream stream(name);

-    if (stream.Ok())
+    if (stream.IsOk())

     {
         wxImage image(decoder.ReadFile(stream));
     {
         wxImage image(decoder.ReadFile(stream));

-        return image.Ok() && bitmap->CreateFromImage(image);
+        return image.IsOk() && bitmap->CreateFromImage(image);

     }
 
     return false;
     }
 
     return false;


@@ -1427,25 +1427,25 @@ public:
 
     virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),
 
     virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),

-                          long WXUNUSED(flags),
+                          wxBitmapType WXUNUSED(flags),

                           int WXUNUSED(desiredWidth),
                           int WXUNUSED(desiredHeight))
         { return false; }
 
     virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),
                           int WXUNUSED(desiredWidth),
                           int WXUNUSED(desiredHeight))
         { return false; }
 
     virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),

-                          int WXUNUSED(type),
+                          wxBitmapType WXUNUSED(type),

                           const wxPalette *WXUNUSED(palette) = NULL)
         { return false; }
 
                           const wxPalette *WXUNUSED(palette) = NULL)
         { return false; }
 

-    virtual bool Create(wxBitmap *bitmap, void *data, long flags,
+    virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType flags,

                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 

-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
-                              long WXUNUSED(flags),
+bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
+                              wxBitmapType WXUNUSED(flags),

                               int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
 {
 #if wxHAVE_LIB_XPM
                               int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
 {
 #if wxHAVE_LIB_XPM


@@ -1491,7 +1491,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
 
         XpmFreeAttributes(&xpmAttr);
 
 
         XpmFreeAttributes(&xpmAttr);
 

-        M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
+        M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap;

 
         if (mask)
         {
 
         if (mask)
         {


@@ -1544,13 +1544,13 @@ public:
                           const wxPalette *WXUNUSED(palette) = NULL)
         { return false; }
 
                           const wxPalette *WXUNUSED(palette) = NULL)
         { return false; }
 

-    virtual bool Create(wxBitmap *bitmap, void *data, long flags,
+    virtual bool Create(wxBitmap *bitmap, const void* data, long flags,

                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
 
                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
 

-bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
+bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits,

                                long WXUNUSED(flags),
                                int width, int height, int WXUNUSED(depth))
 {
                                long WXUNUSED(flags),
                                int width, int height, int WXUNUSED(depth))
 {


@@ -1565,10 +1565,10 @@ bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
     int xscreen = DefaultScreen( xdisplay );
     Window xroot = RootWindow( xdisplay, xscreen );
 
     int xscreen = DefaultScreen( xdisplay );
     Window xroot = RootWindow( xdisplay, xscreen );
 

-    M_BMPHANDLERDATA->m_mask = (wxMask *) NULL;
+    M_BMPHANDLERDATA->m_mask = NULL;

     M_BMPHANDLERDATA->m_bitmap =
     M_BMPHANDLERDATA->m_bitmap =

-        (WXPixmap) XCreateBitmapFromData( xdisplay, xroot,
-                                          (char *) bits, width, height );
+        XCreateBitmapFromData(xdisplay, xroot,
+                              (char *) bits, width, height );

     M_BMPHANDLERDATA->m_width = width;
     M_BMPHANDLERDATA->m_height = height;
     M_BMPHANDLERDATA->m_bpp = 1;
     M_BMPHANDLERDATA->m_width = width;
     M_BMPHANDLERDATA->m_height = height;
     M_BMPHANDLERDATA->m_bpp = 1;