/////////////////////////////////////////////////////////////////////////////
-// Name: x11/bitmap.h
+// Name: wx/x11/bitmap.h
// Purpose: wxBitmap class
// Author: Julian Smart, Robert Roebling
// Modified by:
// Created: 17/09/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// classes
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxMask;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxImage;
//-----------------------------------------------------------------------------
// wxMask
{
public:
wxMask();
+ wxMask(const wxMask& mask);
wxMask( const wxBitmap& bitmap, const wxColour& colour );
wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap );
private:
WXPixmap m_bitmap;
WXDisplay *m_display;
+ wxSize m_size;
private:
DECLARE_DYNAMIC_CLASS(wxMask)
// wxBitmap
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
- DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
-
class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
{
public:
- wxBitmap();
- wxBitmap( int width, int height, int depth = -1 );
+ wxBitmap() {}
+ wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); }
+ wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); }
+
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
- wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+#ifdef wxNEEDS_CHARPP
+ // needed for old GCC
+ wxBitmap(char** data)
+ {
+ *this = wxBitmap(const_cast<const char* const*>(data));
+ }
+#endif
+ wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
virtual ~wxBitmap();
- bool operator == ( const wxBitmap& bmp ) const;
- bool operator != ( const wxBitmap& bmp ) const;
- bool Ok() const { return IsOk(); }
- bool IsOk() const;
-
static void InitStandardHandlers();
- bool Create(int width, int height, int depth = -1);
+ bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+ bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+ { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
+ bool Create(int width, int height, const wxDC& WXUNUSED(dc))
+ { return Create(width,height); }
+
bool Create(const void* data, wxBitmapType type,
int width, int height, int depth = -1);
// create the wxBitmap using a _copy_ of the pixmap
wxBitmap GetSubBitmap( const wxRect& rect ) const;
- bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const;
- bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM );
+ bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = NULL ) const;
+ bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
- { return GetPalette(); };
+ { return GetPalette(); }
virtual void SetPalette(const wxPalette& palette);
// implementation
WXDisplay *GetDisplay() const;
+protected:
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
-#endif
-// _WX_BITMAP_H_
+#endif // _WX_BITMAP_H_