X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/cocoa/bitmap.h diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index d08dd9ea5a..9fc1b1e937 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/cocoa/bitmap.h +// Name: wx/cocoa/bitmap.h // Purpose: wxBitmap class // Author: David Elliott // Modified by: // Created: 2003/07/19 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_BITMAP_H__ @@ -15,11 +15,11 @@ #include "wx/palette.h" // Bitmap -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxCursor; -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxPixelDataBase; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_CORE wxCursor; +class WXDLLIMPEXP_FWD_CORE wxImage; +class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // ======================================================================== // wxMask @@ -43,6 +43,9 @@ public: // Construct a mask from a mono bitmap (copies the bitmap). wxMask(const wxBitmap& bitmap); + // Copy constructor + wxMask(const wxMask& src); + virtual ~wxMask(); bool Create(const wxBitmap& bitmap, const wxColour& colour); @@ -71,12 +74,15 @@ public: // Initialize with raw data. wxBitmap(const char bits[], int width, int height, int depth = 1); // Initialize with XPM data - wxBitmap(const char **bits) { CreateFromXpm(bits); } - wxBitmap(char **bits) { CreateFromXpm((const char**)bits); } + wxBitmap(const char* const* bits); // Load a file or resource wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE); + // Construct from Cocoa's NSImage + wxBitmap(NSImage* cocoaNSImage); + // Construct from Cocoa's NSBitmapImageRep + wxBitmap(NSBitmapImageRep* cocoaNSBitmapImageRep); // Constructor for generalised creation from data - wxBitmap(void *data, wxBitmapType type, int width, int height, int depth = 1); + wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1); // If depth is omitted, will create a bitmap compatible with the display wxBitmap(int width, int height, int depth = -1); // Convert from wxImage: @@ -87,18 +93,18 @@ public: // destructor virtual ~wxBitmap(); - + // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ public: - // Initialize with XPM data - bool CreateFromXpm(const char **bits); // Initialize from wxImage bool CreateFromImage(const wxImage& image, int depth=-1); virtual bool Create(int width, int height, int depth = -1); - virtual bool Create(void *data, wxBitmapType type, int width, int height, int depth = 1); + bool Create(NSImage* cocoaNSImage); + bool Create(NSBitmapImageRep* cocoaNSBitmapImageRep); + virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE); virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const; @@ -110,7 +116,8 @@ public: // get the given part of bitmap wxBitmap GetSubBitmap( const wxRect& rect ) const; - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; int GetWidth() const; int GetHeight() const; int GetDepth() const; @@ -124,7 +131,6 @@ public: // raw bitmap access support functions void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); - void UseAlpha(); wxPalette* GetPalette() const; void SetPalette(const wxPalette& palette); @@ -133,11 +139,6 @@ public: void SetMask(wxMask *mask) ; int GetBitmapType() const; - - inline bool operator == (const wxBitmap& bitmap) const - { return m_refData == bitmap.m_refData; } - inline bool operator != (const wxBitmap& bitmap) const - { return m_refData != bitmap.m_refData; } // wxObjectRefData wxObjectRefData *CreateRefData() const; @@ -152,4 +153,10 @@ public: static void CleanUpHandlers() { } }; -#endif // __WX_COCOA_BITMAP_H__ +class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase +{ + DECLARE_ABSTRACT_CLASS(wxBitmapHandler) +}; + +#endif + // __WX_COCOA_BITMAP_H__