X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bbbae215ccb4e6375b8aa4ab437d6709dfe5354..9d52aad39a4e3b52c5baa50b9cc55caaf91bb026:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index e79dc0e935..ffde65f429 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -12,25 +12,23 @@ #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 wxDC; -class WXDLLEXPORT wxControl; -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxBitmapHandler; -class WXDLLEXPORT wxBitmapRefData; -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxMask; -class WXDLLEXPORT wxCursor; -class WXDLLEXPORT wxControl; -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; +class WXDLLIMPEXP_FWD_CORE wxBitmapRefData; +class WXDLLIMPEXP_FWD_CORE wxControl; +class WXDLLIMPEXP_FWD_CORE wxCursor; +class WXDLLIMPEXP_FWD_CORE wxDC; +#if wxUSE_WXDIB +class WXDLLIMPEXP_FWD_CORE wxDIB; +#endif +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_CORE wxImage; +class WXDLLIMPEXP_FWD_CORE wxMask; +class WXDLLIMPEXP_FWD_CORE wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // ---------------------------------------------------------------------------- // wxBitmap: a mono or colour bitmap @@ -40,43 +38,49 @@ 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); - // If depth is omitted, will create a bitmap compatible with the display + // Create a new, uninitialized bitmap of the given size and depth (if it + // is omitted, will create a bitmap compatible with the display) + // + // NB: this ctor will create a DIB for 24 and 32bpp bitmaps, use ctor + // taking a DC argument if you want to force using DDB in this case wxBitmap(int width, int height, int depth = -1); + // Create a bitmap compatible with the given DC + wxBitmap(int width, int height, const wxDC& dc); + #if wxUSE_IMAGE - // Convert from wxImage: + // Convert from wxImage wxBitmap(const wxImage& image, int depth = -1) { (void)CreateFromImage(image, depth); } + + // Create a DDB compatible with the given DC from wxImage + wxBitmap(const wxImage& image, const wxDC& dc) + { (void)CreateFromImage(image, dc); } #endif // wxUSE_IMAGE // 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) { @@ -107,95 +111,72 @@ 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(void *data, long type, int width, int height, int depth = 1); + virtual bool Create(int width, int height, const wxDC& dc); + 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); wxBitmapRefData *GetBitmapData() const { return (wxBitmapRefData *)m_refData; } + // raw bitmap access support functions + void *GetRawData(wxPixelDataBase& data, int bpp); + void UngetRawData(wxPixelDataBase& data); + #if wxUSE_PALETTE wxPalette* GetPalette() const; void SetPalette(const wxPalette& palette); #endif // wxUSE_PALETTE wxMask *GetMask() 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; } - -#if wxUSE_DIB_FOR_BITMAP - // returns TRUE if this bitmap is a DIB (otherwise it's a DDB) - bool IsDIB() const; -#endif // wxUSE_DIB_FOR_BITMAP + wxBitmap GetMaskBitmap() const; + void SetMask(wxMask *mask); -#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 + // 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 - void SetOk(bool isOk); -#endif // WXWIN_COMPATIBILITY_2 - -#if wxUSE_PALETTE -#if WXWIN_COMPATIBILITY - wxPalette *GetColourMap() const { return GetPalette(); } - void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); }; -#endif // WXWIN_COMPATIBILITY -#endif // wxUSE_PALETTE + // implementation only from now on + // ------------------------------- - // Implementation public: void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); } WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); } +#ifdef __WXDEBUG__ void SetSelectedInto(wxDC *dc); wxDC *GetSelectedInto() const; - - // Creates a bitmap that matches the device context's depth, from an - // arbitray bitmap. At present, the original bitmap must have an associated - // palette. (TODO: use a default palette if no palette exists.) This - // function is necessary for you to Blit an arbitrary bitmap (which may - // have the wrong depth). wxDC::SelectObject will compare the depth of the - // bitmap with the DC's depth, and create a new bitmap if the depths - // differ. Eventually we should perhaps make this a public API function so - // that an app can efficiently produce bitmaps of the correct depth. The - // Windows solution is to use SetDibBits to blit an arbotrary DIB directly - // to a DC, but this is too Windows-specific, hence this solution of - // quietly converting the wxBitmap. Contributed by Frederic Villeneuve - // - wxBitmap GetBitmapForDC(wxDC& dc) const; +#endif // __WXDEBUG__ protected: - // common part of all ctors - void Init(); - virtual wxGDIImageRefData *CreateData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - // creates the bitmap from XPM data, supposed to be called from ctor - bool CreateFromXpm(const char **bits); + // creates an uninitialized bitmap, called from Create()s above + bool DoCreate(int w, int h, int depth, WXHDC hdc); #if wxUSE_IMAGE // creates the bitmap from wxImage, supposed to be called from ctor bool CreateFromImage(const wxImage& image, int depth); -#endif // wxUSE_IMAGE -#if wxUSE_DIB_FOR_BITMAP - void *CreateDIB(int width, int height, int depth); + // creates a DDB from wxImage, supposed to be called from ctor + bool CreateFromImage(const wxImage& image, const wxDC& dc); - void CopyDIBLine(void* src, void* dest, int count) const; -#endif // wxUSE_DIB_FOR_BITMAP + // common part of the 2 methods above (hdc may be 0) + bool CreateFromImage(const wxImage& image, int depth, WXHDC hdc); +#endif // wxUSE_IMAGE private: -#ifdef __WIN32__ // common part of CopyFromIcon/CopyFromCursor for Win32 bool CopyFromIconOrCursor(const wxGDIImage& icon); -#endif // __WIN32__ + DECLARE_DYNAMIC_CLASS(wxBitmap) }; @@ -209,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); @@ -246,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) { @@ -255,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, @@ -268,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,