X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10b41b53cb6049edac26dd0a3210d2a44e9066ff..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index cd67008e6b..edd355e23a 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -12,12 +12,7 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ - #pragma interface "bitmap.h" -#endif - #include "wx/msw/gdiimage.h" -#include "wx/gdicmn.h" #include "wx/palette.h" class WXDLLEXPORT wxBitmap; @@ -26,12 +21,14 @@ class WXDLLEXPORT wxBitmapRefData; class WXDLLEXPORT wxControl; class WXDLLEXPORT wxCursor; class WXDLLEXPORT wxDC; +#if wxUSE_WXDIB class WXDLLEXPORT wxDIB; +#endif class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxImage; class WXDLLEXPORT wxMask; class WXDLLEXPORT wxPalette; -class WXDLLEXPORT wxRawBitmapData; +class WXDLLEXPORT wxPixelDataBase; // ---------------------------------------------------------------------------- // wxBitmap: a mono or colour bitmap @@ -41,23 +38,25 @@ class WXDLLEXPORT wxBitmap : public wxGDIImage { public: // default ctor creates an invalid bitmap, you must Create() it later - wxBitmap() { Init(); } - - // Copy constructors - wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); } + wxBitmap() { } // Initialize with raw data wxBitmap(const char bits[], int width, int height, int depth = 1); // Initialize with XPM data - wxBitmap(const char **data) { CreateFromXpm(data); } - wxBitmap(char **data) { CreateFromXpm((const char **)data); } + wxBitmap(const char* const* data); +#ifdef wxNEEDS_CHARPP + wxBitmap(char** data) + { + *this = wxBitmap(wx_const_cast(const char* const*, data)); + } +#endif // Load a file or resource wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE); // New constructor for generalised creation from data - wxBitmap(void *data, long type, int width, int height, int depth = 1); + wxBitmap(const void* data, long type, int width, int height, int depth = 1); // Create a new, uninitialized bitmap of the given size and depth (if it // is omitted, will create a bitmap compatible with the display) @@ -81,14 +80,7 @@ public: // we must have this, otherwise icons are silently copied into bitmaps using // the copy ctor but the resulting bitmap is invalid! - wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); } - - wxBitmap& operator=(const wxBitmap& bitmap) - { - if ( m_refData != bitmap.m_refData ) - Ref(bitmap); - return *this; - } + wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } wxBitmap& operator=(const wxIcon& icon) { @@ -119,12 +111,14 @@ public: // copies the contents and mask of the given cursor to the bitmap bool CopyFromCursor(const wxCursor& cursor); +#if wxUSE_WXDIB // copies from a device independent bitmap bool CopyFromDIB(const wxDIB& dib); +#endif virtual bool Create(int width, int height, int depth = -1); virtual bool Create(int width, int height, const wxDC& dc); - virtual bool Create(void *data, long type, int width, int height, int depth = 1); + virtual bool Create(const 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); @@ -132,8 +126,8 @@ public: { return (wxBitmapRefData *)m_refData; } // raw bitmap access support functions - bool GetRawData(wxRawBitmapData *data); - void UngetRawData(wxRawBitmapData *) { /* nothing to do here */ } + void *GetRawData(wxPixelDataBase& data, int bpp); + void UngetRawData(wxPixelDataBase& data); #if wxUSE_PALETTE wxPalette* GetPalette() const; @@ -141,34 +135,14 @@ public: #endif // wxUSE_PALETTE wxMask *GetMask() const; + wxBitmap GetMaskBitmap() const; void SetMask(wxMask *mask); - bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; } - bool operator!=(const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; } - // these functions are internal and shouldn't be used, they risk to // disappear in the future bool HasAlpha() const; void UseAlpha(); -#if WXWIN_COMPATIBILITY_2_4 - // these functions do nothing and are only there for backwards - // compatibility - wxDEPRECATED( int GetQuality() const ); - wxDEPRECATED( void SetQuality(int quality) ); -#endif // WXWIN_COMPATIBILITY_2_4 - -#if WXWIN_COMPATIBILITY_2 - void SetOk(bool isOk); -#endif // WXWIN_COMPATIBILITY_2 - -#if WXWIN_COMPATIBILITY -#if wxUSE_PALETTE - wxPalette *GetColourMap() const { return GetPalette(); } - void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); }; -#endif // wxUSE_PALETTE -#endif // WXWIN_COMPATIBILITY - // implementation only from now on // ------------------------------- @@ -182,13 +156,8 @@ public: #endif // __WXDEBUG__ protected: - // common part of all ctors - void Init(); - virtual wxGDIImageRefData *CreateData() const; - - // creates the bitmap from XPM data, supposed to be called from ctor - bool CreateFromXpm(const char **bits); + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; // creates an uninitialized bitmap, called from Create()s above bool DoCreate(int w, int h, int depth, WXHDC hdc); @@ -205,10 +174,9 @@ protected: #endif // wxUSE_IMAGE private: -#ifdef __WIN32__ // common part of CopyFromIcon/CopyFromCursor for Win32 bool CopyFromIconOrCursor(const wxGDIImage& icon); -#endif // __WIN32__ + DECLARE_DYNAMIC_CLASS(wxBitmap) }; @@ -222,6 +190,9 @@ class WXDLLEXPORT wxMask : public wxObject public: wxMask(); + // Copy constructor + wxMask(const wxMask &mask); + // Construct a mask from a bitmap and a colour indicating the transparent // area wxMask(const wxBitmap& bitmap, const wxColour& colour); @@ -259,7 +230,7 @@ protected: class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler { public: - wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } + wxBitmapHandler() { } wxBitmapHandler(const wxString& name, const wxString& ext, long type) : wxGDIImageHandler(name, ext, type) { @@ -268,7 +239,7 @@ public: // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the // old class which worked only with bitmaps virtual bool Create(wxBitmap *bitmap, - void *data, + const void* data, long flags, int width, int height, int depth = 1); virtual bool LoadFile(wxBitmap *bitmap, @@ -281,7 +252,7 @@ public: const wxPalette *palette = NULL); virtual bool Create(wxGDIImage *image, - void *data, + const void* data, long flags, int width, int height, int depth = 1); virtual bool Load(wxGDIImage *image,