X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d71c423e19797b33f5f07aa9582feed3e7cb57a4..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/bitmap.h diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h index c5120eb4be..dae1493b87 100644 --- a/include/wx/mac/bitmap.h +++ b/include/wx/mac/bitmap.h @@ -12,7 +12,7 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "bitmap.h" #endif @@ -27,18 +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 ) ; -CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize ) ; -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(); @@ -72,6 +66,8 @@ enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData { + DECLARE_NO_COPY_CLASS(wxBitmapRefData) + friend class WXDLLEXPORT wxBitmap; friend class WXDLLEXPORT wxIcon; friend class WXDLLEXPORT wxCursor; @@ -88,10 +84,10 @@ public: wxPalette m_bitmapPalette; int m_quality; - int m_bitmapType ; - PicHandle m_hPict ; - WXHBITMAP m_hBitmap; - WXHICON m_hIcon ; + int m_bitmapType ; + WXHMETAFILE m_hPict ; + WXHBITMAP m_hBitmap; + WXHICON m_hIcon ; wxMask * m_bitmapMask; // Optional mask }; @@ -101,22 +97,21 @@ class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase { DECLARE_DYNAMIC_CLASS(wxBitmapHandler) public: - wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; }; -#ifdef __DARWIN__ - virtual ~wxBitmapHandler() { } -#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(const 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; } + 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; @@ -135,7 +130,8 @@ public: wxBitmap(); // Platform-specific // Copy constructors - inline wxBitmap(const wxBitmap& bitmap) + wxBitmap(const wxBitmap& bitmap) + : wxBitmapBase() { Ref(bitmap); } // Initialize with raw data. @@ -193,20 +189,10 @@ 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, wxBitmapType type); - static wxBitmapHandler *FindHandler(wxBitmapType type); + 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: // TODO: Implementation @@ -216,7 +202,7 @@ public: 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); };