#include "wx/object.h"
#include "wx/string.h"
#include "wx/palette.h"
-#include "wx/image.h"
+#include "wx/gdiobj.h"
//-----------------------------------------------------------------------------
// classes
class wxMask: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxMask)
-
public:
- wxMask();
- wxMask( const wxBitmap& bitmap, const wxColour& colour );
- wxMask( const wxBitmap& bitmap, int paletteIndex );
- wxMask( const wxBitmap& bitmap );
- ~wxMask();
-
- // implementation
+ wxMask();
+ wxMask( const wxBitmap& bitmap, const wxColour& colour );
+ wxMask( const wxBitmap& bitmap, int paletteIndex );
+ wxMask( const wxBitmap& bitmap );
+ ~wxMask();
+
+ bool Create( const wxBitmap& bitmap, const wxColour& colour );
+ bool Create( const wxBitmap& bitmap, int paletteIndex );
+ bool Create( const wxBitmap& bitmap );
+
+ // implementation
+ GdkBitmap *m_bitmap;
- GdkBitmap *m_bitmap;
- GdkBitmap *GetBitmap() const;
+ GdkBitmap *GetBitmap() const;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxMask)
};
//-----------------------------------------------------------------------------
// wxBitmap
//-----------------------------------------------------------------------------
-class wxBitmap: public wxObject
+class wxBitmap: public wxGDIObject
{
- DECLARE_DYNAMIC_CLASS(wxBitmap)
-
public:
- wxBitmap();
- wxBitmap( int width, int height, int depth = -1 );
- wxBitmap( const char bits[], int width, int height, int depth = 1 );
- wxBitmap( const wxImage &image );
- wxBitmap( char **bits );
- wxBitmap( const wxBitmap& bmp );
- wxBitmap( const wxBitmap* bmp );
- wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
- ~wxBitmap();
- wxBitmap& operator = ( const wxBitmap& bmp );
- bool operator == ( const wxBitmap& bmp );
- bool operator != ( const wxBitmap& bmp );
- bool Ok() const;
+ wxBitmap();
+ wxBitmap( int width, int height, int depth = -1 );
+ wxBitmap( const char bits[], int width, int height, int depth = 1 );
+ wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
+ wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
+ wxBitmap( const wxBitmap& bmp );
+ wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
+ ~wxBitmap();
+ wxBitmap& operator = ( const wxBitmap& bmp );
+ bool operator == ( const wxBitmap& bmp );
+ bool operator != ( const wxBitmap& bmp );
+ bool Ok() const;
+
+ int GetHeight() const;
+ int GetWidth() const;
+ int GetDepth() const;
+
+ wxMask *GetMask() const;
+ void SetMask( wxMask *mask );
- wxImage ConvertToImage() const;
+ wxBitmap GetSubBitmap( const wxRect& rect ) const;
- int GetHeight() const;
- int GetWidth() const;
- int GetDepth() const;
- void SetHeight( int height );
- void SetWidth( int width );
- void SetDepth( int depth );
+ bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
+ bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
- wxMask *GetMask() const;
- void SetMask( wxMask *mask );
+ wxPalette *GetPalette() const;
+ wxPalette *GetColourMap() const
+ { return GetPalette(); };
- bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
- bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
+ // implementation
+ // --------------
- wxPalette *GetPalette() const;
- wxPalette *GetColourMap() const
- { return GetPalette(); };
-
-// implementation
+ void SetHeight( int height );
+ void SetWidth( int width );
+ void SetDepth( int depth );
+ void SetPixmap( GdkPixmap *pixmap );
- GdkPixmap *GetPixmap() const;
- GdkBitmap *GetBitmap() const;
+ GdkPixmap *GetPixmap() const;
+ GdkBitmap *GetBitmap() const;
+
+protected:
+ bool CreateFromXpm(const char **bits);
- // no data :-)
+private:
+ DECLARE_DYNAMIC_CLASS(wxBitmap)
};
#endif // __GTKBITMAPH__