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>
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;
bool wxMask::Create( const wxBitmap& bitmap,
const wxColour& colour )
{
+ m_size = bitmap.GetSize();
+
#if !wxUSE_NANOX
if (m_bitmap)
{
m_display = bitmap.GetDisplay();
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return false;
+ if (!image.IsOk()) return false;
m_display = bitmap.GetDisplay();
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") );
}
//-----------------------------------------------------------------------------
-// wxBitmap
+// wxBitmapRefData
//-----------------------------------------------------------------------------
class wxBitmapRefData : public wxGDIRefData
m_width = 0;
m_height = 0;
m_bpp = 0;
- m_palette = (wxPalette *) NULL;
+ m_palette = NULL;
}
wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
#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
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::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;
}
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();
// 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 );
{
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") );
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;
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() )
{
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);
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;
}
if (!image.LoadFile( name, type ))
return false;
- if (image.Ok())
+ if (image.IsOk())
{
*this = wxBitmap(image);
return true;
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();
- 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
{
- if (!Ok()) return (wxPalette *) NULL;
+ if (!IsOk()) return NULL;
return M_BMPDATA->m_palette;
}
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
{
- 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
{
- 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);
WXDisplay *wxBitmap::GetDisplay() const
{
- wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_display;
}
class wxXPMFileHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
public:
wxXPMFileHandler()
{
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), 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; }
+
+ 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
#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;
#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;
}
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, 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,
- long WXUNUSED(flags),
+ wxBitmapType WXUNUSED(flags),
int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
{
#if wxHAVE_LIB_XPM
M_BMPHANDLERDATA->m_bpp = bpp; // mono as well?
-#if __WXDEBUG__
+#if wxDEBUG_LEVEL
unsigned int depthRet;
int xRet, yRet;
unsigned int widthRet, heightRet, borderWidthRet;
&widthRet, &heightRet, &borderWidthRet, &depthRet);
wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") );
-#endif
+#endif // wxDEBUG_LEVEL
XpmFreeAttributes(&xpmAttr);
#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
}
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, 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,
- long WXUNUSED(flags),
+ wxBitmapType WXUNUSED(type),
int width, int height, int WXUNUSED(depth))
{
#if !wxUSE_NANOX
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 );
projects / wxWidgets.git / blobdiff