X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..06a32e049c1bad9249079ad2e91659303424a774:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index ae4c2e3f12..b35d0861ac 100644 --- 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" -#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" @@ -36,6 +34,10 @@ 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 @@ -44,7 +46,6 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, #include "wx/wfstream.h" #endif #endif -#include "wx/math.h" //----------------------------------------------------------------------------- // wxMask @@ -58,6 +59,24 @@ wxMask::wxMask() 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; @@ -85,6 +104,8 @@ wxMask::~wxMask() bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour ) { + m_size = bitmap.GetSize(); + #if !wxUSE_NANOX if (m_bitmap) { @@ -95,7 +116,7 @@ bool wxMask::Create( const wxBitmap& bitmap, m_display = bitmap.GetDisplay(); wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return false; + if (!image.IsOk()) return false; m_display = bitmap.GetDisplay(); @@ -199,7 +220,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) 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") ); @@ -227,18 +248,24 @@ bool wxMask::Create( const wxBitmap& bitmap ) } //----------------------------------------------------------------------------- -// wxBitmap +// wxBitmapRefData //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData : public wxGDIRefData { 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; @@ -248,22 +275,67 @@ public: wxBitmapRefData::wxBitmapRefData() { - m_pixmap = NULL; - m_bitmap = NULL; + m_pixmap = 0; + m_bitmap = 0; m_display = NULL; - m_mask = (wxMask *) NULL; + m_mask = NULL; 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() { - 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; } //----------------------------------------------------------------------------- @@ -299,18 +371,14 @@ static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap, 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 ) { @@ -320,50 +388,10 @@ bool wxBitmap::Create( int width, int height, int depth ) 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(); @@ -390,13 +418,12 @@ bool wxBitmap::Create(WXPixmap pixmap) // 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 ); - 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 ); @@ -406,11 +433,11 @@ bool wxBitmap::Create(WXPixmap pixmap) wxBitmapRefData* ref = new wxBitmapRefData(); if( depth == 1 ) - ref->m_bitmap = (WXPixmap)copy; + ref->m_bitmap = copy; 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; @@ -420,19 +447,27 @@ bool wxBitmap::Create(WXPixmap pixmap) 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(data)); } 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; } @@ -538,7 +573,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) 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(); @@ -578,12 +613,13 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) 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 ); @@ -633,8 +669,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) 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++) { @@ -759,7 +793,7 @@ wxImage wxBitmap::ConvertToImage() const { 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") ); @@ -915,60 +949,46 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int depth ) { 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() { } -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") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); 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 { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); 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 ) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); + AllocExclusive(); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; M_BMPDATA->m_mask = mask; @@ -982,14 +1002,14 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) 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 ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); 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 { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); wxBitmapHandler *handler = FindHandler(type); @@ -1036,7 +1056,7 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, 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; } @@ -1058,7 +1078,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) if (!image.LoadFile( name, type )) return false; - if (image.Ok()) + if (image.IsOk()) { *this = wxBitmap(image); return true; @@ -1071,42 +1091,42 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) 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")); - delete M_BMPDATA->m_palette; - M_BMPDATA->m_palette = NULL; + AllocExclusive(); + wxDELETE(M_BMPDATA->m_palette); - if (!palette.Ok()) return; + if (!palette.IsOk()) return; 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; } void wxBitmap::SetHeight( int height ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + AllocExclusive(); 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 ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + AllocExclusive(); M_BMPDATA->m_bpp = depth; } @@ -1115,40 +1135,41 @@ void wxBitmap::SetPixmap( WXPixmap pixmap ) { 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(); - M_BMPDATA->m_bitmap = bitmap; + M_BMPDATA->m_bitmap = (Pixmap)bitmap; } WXPixmap wxBitmap::GetPixmap() const { - wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), (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") ); + wxCHECK_MSG( IsOk(), (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") ); + wxCHECK_MSG( IsOk(), (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 { - wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_display; } @@ -1294,8 +1315,6 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe // Bitmap handlers // ============================================================================ -IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) - #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) #if wxUSE_XPM @@ -1308,7 +1327,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) class wxXPMFileHandler : public wxBitmapHandler { - DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) public: wxXPMFileHandler() { @@ -1317,21 +1335,31 @@ public: 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 type, const wxPalette *palette = NULL); - - virtual bool Create(wxBitmap *WXUNUSED(bitmap), 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; } + + DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) }; 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 @@ -1354,7 +1382,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, Pixmap mask = 0; int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot, - (char*) name.c_str(), + (char*) ((const char*) name.c_str()), &pixmap, &mask, &xpmAttr); if (ErrorStatus == XpmSuccess) @@ -1366,7 +1394,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, XpmFreeAttributes(&xpmAttr); - M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap; + M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap; if (mask) { @@ -1386,10 +1414,10 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, #elif wxUSE_STREAMS wxXPMDecoder decoder; wxFileInputStream stream(name); - if (stream.Ok()) + if (stream.IsOk()) { wxImage image(decoder.ReadFile(stream)); - return image.Ok() && bitmap->CreateFromImage(image); + return image.IsOk() && bitmap->CreateFromImage(image); } return false; @@ -1398,12 +1426,14 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, #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()); - if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type ); + if (image.IsOk()) + return image.SaveFile( name, type ); return false; } @@ -1427,25 +1457,25 @@ public: 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(type), - const wxPalette *WXUNUSED(palette) = NULL) + wxBitmapType WXUNUSED(type), + const wxPalette *WXUNUSED(palette) = NULL) const { 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) -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 @@ -1479,7 +1509,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits, M_BMPHANDLERDATA->m_bpp = bpp; // mono as well? -#if __WXDEBUG__ +#if wxDEBUG_LEVEL unsigned int depthRet; int xRet, yRet; unsigned int widthRet, heightRet, borderWidthRet; @@ -1487,11 +1517,11 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits, &widthRet, &heightRet, &borderWidthRet, &depthRet); wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") ); -#endif +#endif // wxDEBUG_LEVEL XpmFreeAttributes(&xpmAttr); - M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap; + M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap; if (mask) { @@ -1510,7 +1540,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *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 } @@ -1533,25 +1563,25 @@ public: 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(type), - const wxPalette *WXUNUSED(palette) = NULL) + wxBitmapType WXUNUSED(type), + const wxPalette *WXUNUSED(palette) = NULL) const { return false; } - virtual bool Create(wxBitmap *bitmap, 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, void *bits, - long WXUNUSED(flags), +bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits, + wxBitmapType WXUNUSED(type), int width, int height, int WXUNUSED(depth)) { #if !wxUSE_NANOX @@ -1565,10 +1595,10 @@ bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits, int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); - M_BMPHANDLERDATA->m_mask = (wxMask *) NULL; + M_BMPHANDLERDATA->m_mask = NULL; 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;