X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd85921189610501e38fb501801b1eb6b9560fe7..158b668823e14d9b42c9e7fe0281d35924192c68:/include/wx/mac/bitmap.h?ds=sidebyside diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h index 84e7153375..dae1493b87 100644 --- a/include/wx/mac/bitmap.h +++ b/include/wx/mac/bitmap.h @@ -12,12 +12,10 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ -#pragma interface "bitmap.h" +#if defined(__GNUG__) && !defined(__APPLE__) + #pragma interface "bitmap.h" #endif -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" #include "wx/palette.h" // Bitmap @@ -29,17 +27,12 @@ class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxCursor; class WXDLLEXPORT wxImage; -GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) ; -void wxMacDestroyGWorld( GWorldPtr gw ) ; -PicHandle wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ; -void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ; -CTabHandle wxMacCreateColorTable( int numColors ) ; - // A mask is a mono bitmap used for drawing bitmaps // transparently. class WXDLLEXPORT wxMask: public wxObject { - DECLARE_DYNAMIC_CLASS(wxMask) + DECLARE_DYNAMIC_CLASS(wxMask) + DECLARE_NO_COPY_CLASS(wxMask) public: wxMask(); @@ -69,10 +62,12 @@ protected: WXHBITMAP m_maskBitmap; }; -enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ; +enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ; class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData { + DECLARE_NO_COPY_CLASS(wxBitmapRefData) + friend class WXDLLEXPORT wxBitmap; friend class WXDLLEXPORT wxIcon; friend class WXDLLEXPORT wxCursor; @@ -89,34 +84,34 @@ public: wxPalette m_bitmapPalette; int m_quality; - int m_bitmapType ; - PicHandle m_hPict ; - WXHBITMAP m_hBitmap; + int m_bitmapType ; + WXHMETAFILE m_hPict ; + WXHBITMAP m_hBitmap; + WXHICON m_hIcon ; wxMask * m_bitmapMask; // Optional mask }; #define M_BITMAPDATA ((wxBitmapRefData *)m_refData) -class WXDLLEXPORT wxBitmapHandler: public wxObject +class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase { DECLARE_DYNAMIC_CLASS(wxBitmapHandler) public: - wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; }; -#ifdef __WXMAC_X__ - virtual ~wxBitmapHandler() {} // Added min for Mac X -#endif + wxBitmapHandler() : m_name(), m_extension(), m_type(0) { } + virtual ~wxBitmapHandler(); virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); - - inline void SetName(const wxString& name) { m_name = name; } - inline void SetExtension(const wxString& ext) { m_extension = ext; } - inline void SetType(long type) { m_type = type; } - inline wxString GetName() const { return m_name; } - inline wxString GetExtension() const { return m_extension; } - inline long GetType() const { return m_type; } + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); + + void SetName(const wxString& name) { m_name = name; } + void SetExtension(const wxString& ext) { m_extension = ext; } + void SetType(long type) { m_type = type; } + wxString GetName() const { return m_name; } + wxString GetExtension() const { return m_extension; } + long GetType() const { return m_type; } + protected: wxString m_name; wxString m_extension; @@ -125,7 +120,7 @@ protected: #define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) -class WXDLLEXPORT wxBitmap: public wxGDIObject +class WXDLLEXPORT wxBitmap: public wxBitmapBase { DECLARE_DYNAMIC_CLASS(wxBitmap) @@ -135,21 +130,23 @@ public: wxBitmap(); // Platform-specific // Copy constructors - inline wxBitmap(const wxBitmap& bitmap) - { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } + wxBitmap(const wxBitmap& bitmap) + : wxBitmapBase() + { Ref(bitmap); } // Initialize with raw data. wxBitmap(const char bits[], int width, int height, int depth = 1); // Initialize with XPM data - wxBitmap(const char **data); - wxBitmap(char **data); + bool CreateFromXpm(const char **bits); + wxBitmap(const char **bits); + wxBitmap(char **bits); // Load a file or resource - wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_PICT_RESOURCE); + wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_PICT_RESOURCE); // Constructor for generalised creation from data - wxBitmap(void *data, long type, int width, int height, int depth = 1); + wxBitmap(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); @@ -165,9 +162,12 @@ public: wxBitmap GetSubBitmap( const wxRect& rect ) const; virtual bool Create(int width, int height, int depth = -1); - virtual bool Create(void *data, long type, int width, int height, int depth = 1); - virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE); - virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL); + virtual bool Create(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; + + // copies the contents and mask of the given (colour) icon to the bitmap + virtual bool CopyFromIcon(const wxIcon& icon); bool Ok() const; int GetWidth() const; @@ -189,29 +189,20 @@ public: int GetBitmapType() const; inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; } - inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; } - inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; } - - // Format handling - static inline wxList& GetHandlers() { return sm_handlers; } - static void AddHandler(wxBitmapHandler *handler); - static void InsertHandler(wxBitmapHandler *handler); - static bool RemoveHandler(const wxString& name); - static wxBitmapHandler *FindHandler(const wxString& name); - static wxBitmapHandler *FindHandler(const wxString& extension, long bitmapType); - static wxBitmapHandler *FindHandler(long bitmapType); + 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; } static void InitStandardHandlers(); - static void CleanUpHandlers(); protected: - static wxList sm_handlers; // TODO: Implementation public: void SetHBITMAP(WXHBITMAP bmp); WXHBITMAP GetHBITMAP() const; + void SetHICON(WXHICON ico); + inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); } - PicHandle GetPict() const; + WXHMETAFILE GetPict() const; bool FreeResource(bool force = FALSE); };