X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/mgl/bitmap.h diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 4df4dbf777..ab6806b3e9 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -3,73 +3,29 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_BITMAP_H__ #define __WX_BITMAP_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "bitmap.h" -#endif - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/palette.h" -#include "wx/gdiobj.h" - - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMask; -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxDC; -class WXDLLEXPORT wxMemoryDC; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxMemoryDC; class MGLDevCtx; struct bitmap_t; -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxMask: public wxObject -{ -public: - wxMask(); - wxMask(const wxBitmap& bitmap, const wxColour& colour); - wxMask(const wxBitmap& bitmap, int paletteIndex); - wxMask(const wxBitmap& bitmap); - ~wxMask(); - - bool Create(const wxBitmap& bitmap, const wxColour& colour); - bool Create(const wxBitmap& bitmap, int paletteIndex); - bool Create(const wxBitmap& bitmap); - - // implementation - wxBitmap *m_bitmap; - - wxBitmap *GetBitmap() const { return m_bitmap; } - -private: - DECLARE_DYNAMIC_CLASS(wxMask) -}; - //----------------------------------------------------------------------------- // wxBitmap //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxBitmapHandlerBase +class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase { -public: - wxBitmapHandler() : wxBitmapHandlerBase() {} -private: - DECLARE_DYNAMIC_CLASS(wxBitmapHandler) + DECLARE_ABSTRACT_CLASS(wxBitmapHandler) }; class WXDLLEXPORT wxBitmap: public wxBitmapBase @@ -78,16 +34,12 @@ public: wxBitmap() {} wxBitmap(int width, int height, int depth = -1); wxBitmap(const char bits[], int width, int height, int depth = 1); - wxBitmap(const char **bits) { CreateFromXpm(bits); } - wxBitmap(char **bits) { CreateFromXpm((const char **)bits); } - wxBitmap(const wxBitmap& bmp); + wxBitmap(const char* const* bits); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); wxBitmap(const wxImage& image, int depth = -1); - ~wxBitmap() {} - wxBitmap& operator = (const wxBitmap& bmp); - bool operator == (const wxBitmap& bmp) const; - bool operator != (const wxBitmap& bmp) const; - bool Ok() const; + virtual ~wxBitmap() {} + bool Ok() const { return IsOk(); } + bool IsOk() const; bool Create(int width, int height, int depth = -1); @@ -118,12 +70,12 @@ public: virtual void SetWidth(int width); virtual void SetDepth(int depth); + virtual wxColour QuantizeColour(const wxColour& colour) const; + // get underlying native representation: bitmap_t *GetMGLbitmap_t() const; protected: - bool CreateFromXpm(const char **bits); - // creates temporary DC for access to bitmap's data: MGLDevCtx *CreateTmpDC() const; // sets fg & bg colours for 1bit bitmaps: