#ifndef __GTKBITMAPH__
#define __GTKBITMAPH__
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface
#endif
class wxMask;
class wxBitmap;
+class wxImage;
//-----------------------------------------------------------------------------
// wxMask
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
+ wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
~wxBitmap();
wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ) const;
int GetHeight() const;
int GetWidth() const;
int GetDepth() const;
+
+ wxImage ConvertToImage() const;
+
+ // copies the contents and mask of the given (colour) icon to the bitmap
+ virtual bool CopyFromIcon(const wxIcon& icon);
wxMask *GetMask() const;
void SetMask( wxMask *mask );
bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
wxPalette *GetPalette() const;
- wxPalette *GetColourMap() const
- { return GetPalette(); };
+ wxPalette *GetColourMap() const { return GetPalette(); };
+
+ static void InitStandardHandlers() { }
+ static void CleanUpHandlers() { }
// implementation
// --------------
protected:
bool CreateFromXpm(const char **bits);
+ bool CreateFromImage(const wxImage& image, int depth);
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)