missing commit

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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 5f9df2b7e233b76fb4a7f58fe86af9f8ede8b29b..b35d0861ac25df8eb109781615bde9e2ae98746d 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -34,6 +34,10 @@
 bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image);
 #endif
 
 bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, int height, wxImage& image);
 #endif
 

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

 #if wxUSE_XPM
 #if wxHAVE_LIB_XPM
 #include <X11/xpm.h>
 #if wxUSE_XPM
 #if wxHAVE_LIB_XPM
 #include <X11/xpm.h>


@@ -55,6 +59,24 @@ wxMask::wxMask()
     m_display = NULL;
 }
 
     m_display = NULL;
 }
 

+wxMask::wxMask(const wxMask& mask)
+{
+    m_display = mask.m_display;
+    if ( !mask.m_bitmap )
+    {
+        m_bitmap = NULL;
+        return;
+    }
+
+    m_size = mask.m_size;
+
+    // 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);
+}
+

 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
     m_bitmap = NULL;
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
     m_bitmap = NULL;


@@ -82,6 +104,8 @@ wxMask::~wxMask()
 bool wxMask::Create( const wxBitmap& bitmap,
                      const wxColour& colour )
 {
 bool wxMask::Create( const wxBitmap& bitmap,
                      const wxColour& colour )
 {

+    m_size = bitmap.GetSize();
+

 #if !wxUSE_NANOX
     if (m_bitmap)
     {
 #if !wxUSE_NANOX
     if (m_bitmap)
     {


@@ -92,7 +116,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     m_display = bitmap.GetDisplay();
 
     wxImage image = bitmap.ConvertToImage();
     m_display = bitmap.GetDisplay();
 
     wxImage image = bitmap.ConvertToImage();

-    if (!image.Ok()) return false;
+    if (!image.IsOk()) return false;

 
     m_display = bitmap.GetDisplay();
 
 
     m_display = bitmap.GetDisplay();
 


@@ -196,7 +220,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
         m_bitmap = NULL;
     }
 
         m_bitmap = NULL;
     }
 

-    if (!bitmap.Ok()) return false;
+    if (!bitmap.IsOk()) return false;

 
     wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
 
 
     wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
 


@@ -224,7 +248,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxBitmap
+// wxBitmapRefData

 //-----------------------------------------------------------------------------
 
 class wxBitmapRefData : public wxGDIRefData
 //-----------------------------------------------------------------------------
 
 class wxBitmapRefData : public wxGDIRefData


@@ -258,7 +282,7 @@ wxBitmapRefData::wxBitmapRefData()
     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)
 }
 
 wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)


@@ -295,7 +319,7 @@ bool wxBitmapRefData::Create(int width, int height, int depth)
 #else // !wxUSE_NANOX
     Window xroot = RootWindow(m_display, xscreen);
 
 #else // !wxUSE_NANOX
     Window xroot = RootWindow(m_display, xscreen);
 

-    *(depth == 1 ? &m_bitmap : &m_pixmap) = 
+    *(depth == 1 ? &m_bitmap : &m_pixmap) =

         XCreatePixmap(m_display, xroot, width, height, depth);
 #endif // wxUSE_NANOX/!wxUSE_NANOX
 
         XCreatePixmap(m_display, xroot, width, height, depth);
 #endif // wxUSE_NANOX/!wxUSE_NANOX
 


@@ -347,18 +371,14 @@ static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap,
     return (WXPixmap)ret;
 }
 
     return (WXPixmap)ret;
 }
 

-#define M_BMPDATA ((wxBitmapRefData *)m_refData)

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
+//-----------------------------------------------------------------------------
+// wxBitmap
+//-----------------------------------------------------------------------------

 
 

-wxBitmap::wxBitmap()
-{
-}
+#define M_BMPDATA ((wxBitmapRefData *)m_refData)

 
 

-wxBitmap::wxBitmap( int width, int height, int depth )
-{
-    Create( width, height, depth );
-}
+IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)

 
 bool wxBitmap::Create( int width, int height, int depth )
 {
 
 bool wxBitmap::Create( int width, int height, int depth )
 {


@@ -445,9 +465,9 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 {
 #if wxUSE_NANOX
 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 {
 #if wxUSE_NANOX

-    if (!image.Ok())
+    if (!image.IsOk())

     {
     {

-        wxASSERT_MSG(image.Ok(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage."));
+        wxASSERT_MSG(image.IsOk(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage."));

         return false;
     }
 
         return false;
     }
 


@@ -553,7 +573,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 
     UnRef();
 
 
     UnRef();
 

-    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );

     wxCHECK_MSG( depth == -1, false, wxT("invalid bitmap depth") );
 
     m_refData = new wxBitmapRefData();
     wxCHECK_MSG( depth == -1, false, wxT("invalid bitmap depth") );
 
     m_refData = new wxBitmapRefData();


@@ -598,7 +618,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         // Create mask if necessary
         const bool hasMask = image.HasMask();
 
         // Create mask if necessary
         const bool hasMask = image.HasMask();
 

-        XImage *mask_image = (XImage*) NULL;
+        XImage *mask_image = NULL;

         if ( hasMask )
         {
             mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 );
         if ( hasMask )
         {
             mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 );


@@ -773,7 +793,7 @@ wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
 
 {
     wxImage image;
 

-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );

 
     Display *xdisplay = (Display*) M_BMPDATA->m_display;
     wxASSERT_MSG( xdisplay, wxT("No display") );
 
     Display *xdisplay = (Display*) M_BMPDATA->m_display;
     wxASSERT_MSG( xdisplay, wxT("No display") );


@@ -938,35 +958,35 @@ wxBitmap::~wxBitmap()
 
 int wxBitmap::GetHeight() const
 {
 
 int wxBitmap::GetHeight() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {
 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {
 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {
 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {

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

 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {
 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {

-    wxCHECK_RET( Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );

 
     AllocExclusive();
     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 
     AllocExclusive();
     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;


@@ -982,14 +1002,14 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {

-    wxCHECK_MSG( Ok() &&
+    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") );
 
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
                  (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") );
 
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );

-    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+    wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );

 
     if( GetMask() )
     {
 
     if( GetMask() )
     {


@@ -1028,7 +1048,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type,
                          const wxPalette *palette ) const
 {
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type,
                          const wxPalette *palette ) const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );

 
     wxBitmapHandler *handler = FindHandler(type);
 
 
     wxBitmapHandler *handler = FindHandler(type);
 


@@ -1036,7 +1056,7 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type,
     if (handler == NULL)
     {
         wxImage image(this->ConvertToImage());
     if (handler == NULL)
     {
         wxImage image(this->ConvertToImage());

-        if (image.Ok()) return image.SaveFile( name, type );
+        if (image.IsOk()) return image.SaveFile( name, type );

 
         return false;
     }
 
         return false;
     }


@@ -1058,7 +1078,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
         if (!image.LoadFile( name, type ))
             return false;
 
         if (!image.LoadFile( name, type ))
             return false;
 

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

         {
             *this = wxBitmap(image);
             return true;
         {
             *this = wxBitmap(image);
             return true;


@@ -1071,22 +1091,21 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {

-    wxCHECK_RET(Ok(), wxT("invalid bitmap"));
+    wxCHECK_RET(IsOk(), wxT("invalid bitmap"));

     wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8,
                 wxT("cannot set palette for bitmap of this depth"));
 
     AllocExclusive();
     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;
+    wxDELETE(M_BMPDATA->m_palette);

 
 

-    if (!palette.Ok()) return;
+    if (!palette.IsOk()) return;

 
     M_BMPDATA->m_palette = new wxPalette(palette);
 }
 
 wxPalette *wxBitmap::GetPalette() const
 {
 
     M_BMPDATA->m_palette = new wxPalette(palette);
 }
 
 wxPalette *wxBitmap::GetPalette() const
 {

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

 
     return M_BMPDATA->m_palette;
 }
 
     return M_BMPDATA->m_palette;
 }


@@ -1128,21 +1147,21 @@ void wxBitmap::SetBitmap( WXPixmap bitmap )
 
 WXPixmap wxBitmap::GetPixmap() const
 {
 
 WXPixmap wxBitmap::GetPixmap() const
 {

-    wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") );

 
     return (WXPixmap)M_BMPDATA->m_pixmap;
 }
 
 WXPixmap wxBitmap::GetBitmap() const
 {
 
     return (WXPixmap)M_BMPDATA->m_pixmap;
 }
 
 WXPixmap wxBitmap::GetBitmap() const
 {

-    wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") );

 
     return (WXPixmap)M_BMPDATA->m_bitmap;
 }
 
 WXPixmap wxBitmap::GetDrawable() const
 {
 
     return (WXPixmap)M_BMPDATA->m_bitmap;
 }
 
 WXPixmap wxBitmap::GetDrawable() const
 {

-    wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") );

 
     return (WXPixmap)(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);


@@ -1150,7 +1169,7 @@ WXPixmap wxBitmap::GetDrawable() const
 
 WXDisplay *wxBitmap::GetDisplay() const
 {
 
 WXDisplay *wxBitmap::GetDisplay() const
 {

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

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


@@ -1308,7 +1327,6 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe
 
 class wxXPMFileHandler : public wxBitmapHandler
 {
 
 class wxXPMFileHandler : public wxBitmapHandler
 {

-    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)

 public:
     wxXPMFileHandler()
     {
 public:
     wxXPMFileHandler()
     {


@@ -1317,21 +1335,31 @@ public:
         SetType( wxBITMAP_TYPE_XPM );
     };
 
         SetType( wxBITMAP_TYPE_XPM );
     };
 

-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name,
+                          wxBitmapType flags,

                           int desiredWidth, int desiredHeight);
 
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
                           int desiredWidth, int desiredHeight);
 
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,

-                          int type, const wxPalette *palette = NULL);
-
-    virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data), long WXUNUSED(flags),
-                        int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1)
+                          wxBitmapType type,
+                          const wxPalette *palette = NULL) const;
+
+    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; }
         { return false; }

+
+    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 

-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
-                                long WXUNUSED(flags), int WXUNUSED(desiredWidth),
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
+                                const wxString& name,
+                                wxBitmapType WXUNUSED(flags),
+                                int WXUNUSED(desiredWidth),

                                 int WXUNUSED(desiredHeight))
 {
 #if wxHAVE_LIB_XPM
                                 int WXUNUSED(desiredHeight))
 {
 #if wxHAVE_LIB_XPM


@@ -1386,10 +1414,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;


@@ -1398,12 +1426,14 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
 #endif // wxHAVE_LIB_XPM / wxUSE_STREAMS
 }
 
 #endif // wxHAVE_LIB_XPM / wxUSE_STREAMS
 }
 

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

 {
     wxImage image(bitmap->ConvertToImage());
 {
     wxImage image(bitmap->ConvertToImage());

-    if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type );
+    if (image.IsOk())
+        return image.SaveFile( name, type );

 
     return false;
 }
 
     return false;
 }


@@ -1427,25 +1457,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),
-                          const wxPalette *WXUNUSED(palette) = NULL)
+                          wxBitmapType WXUNUSED(type),
+                          const wxPalette *WXUNUSED(palette) = NULL) const

         { return false; }
 
         { return false; }
 

-    virtual bool Create(wxBitmap *bitmap, const 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)
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,

-                              long WXUNUSED(flags),
+                              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


@@ -1479,7 +1509,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
 
         M_BMPHANDLERDATA->m_bpp = bpp;  // mono as well?
 
 
         M_BMPHANDLERDATA->m_bpp = bpp;  // mono as well?
 

-#if __WXDEBUG__
+#if wxDEBUG_LEVEL

         unsigned int depthRet;
         int xRet, yRet;
         unsigned int widthRet, heightRet, borderWidthRet;
         unsigned int depthRet;
         int xRet, yRet;
         unsigned int widthRet, heightRet, borderWidthRet;


@@ -1487,7 +1517,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
             &widthRet, &heightRet, &borderWidthRet, &depthRet);
 
         wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") );
             &widthRet, &heightRet, &borderWidthRet, &depthRet);
 
         wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") );

-#endif
+#endif // wxDEBUG_LEVEL

 
         XpmFreeAttributes(&xpmAttr);
 
 
         XpmFreeAttributes(&xpmAttr);
 


@@ -1510,7 +1540,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
 #else // !wxHAVE_LIB_XPM
     wxXPMDecoder decoder;
     wxImage image(decoder.ReadData((const char **)bits));
 #else // !wxHAVE_LIB_XPM
     wxXPMDecoder decoder;
     wxImage image(decoder.ReadData((const char **)bits));

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

 #endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM
 }
 
 #endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM
 }
 


@@ -1533,25 +1563,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),
-                          const wxPalette *WXUNUSED(palette) = NULL)
+                          wxBitmapType WXUNUSED(type),
+                          const wxPalette *WXUNUSED(palette) = NULL) const

         { return false; }
 
         { return false; }
 

-    virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
+    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,
                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
 
 bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits,

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

                                int width, int height, int WXUNUSED(depth))
 {
 #if !wxUSE_NANOX
                                int width, int height, int WXUNUSED(depth))
 {
 #if !wxUSE_NANOX


@@ -1565,7 +1595,7 @@ bool wxXBMDataHandler::Create( wxBitmap *bitmap, const 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 =
         XCreateBitmapFromData(xdisplay, xroot,
                               (char *) bits, width, height );
     M_BMPHANDLERDATA->m_bitmap =
         XCreateBitmapFromData(xdisplay, xroot,
                               (char *) bits, width, height );