// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_
#ifdef __GNUG__
-#pragma interface "bitmap.h"
+ #pragma interface "bitmap.h"
#endif
#include "wx/gdiobj.h"
bool Create(const wxBitmap& bitmap);
// Implementation
- inline WXHBITMAP GetMaskBitmap(void) const { return m_maskBitmap; }
- inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
+ WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
+ void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
+
protected:
WXHBITMAP m_maskBitmap;
};
{
DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
public:
- wxBitmapHandler(void) { m_name = ""; m_extension = ""; m_type = 0; };
+ wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; };
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(void) const { return m_name; }
- inline wxString GetExtension(void) const { return m_extension; }
- inline long GetType(void) 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;
class WXDLLEXPORT wxBitmap: public wxGDIObject
{
- DECLARE_DYNAMIC_CLASS(wxBitmap)
-
- friend class WXDLLEXPORT wxBitmapHandler;
+friend class WXDLLEXPORT wxBitmapHandler;
public:
- wxBitmap(); // Platform-specific
+ // default ctor creates an invalid bitmap, you must Create() it later
+ wxBitmap() { Init(); }
+
+ // Copy constructors
+ wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
+
+ // Initialize with raw data
+ wxBitmap(const char bits[], int width, int height, int depth = 1);
+
+ // Initialize with XPM data
+ wxBitmap(char **data, wxControl *anItem = NULL);
- // Copy constructors
- wxBitmap(const wxBitmap& bitmap);
+ // Load a file or resource
+ wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
- // Initialize with raw data
- wxBitmap(const char bits[], int width, int height, int depth = 1);
+ // New constructor for generalised creation from data
+ wxBitmap(void *data, long type, int width, int height, int depth = 1);
- // Initialize with XPM data
- wxBitmap(char **data, wxControl *anItem = NULL);
+ // If depth is omitted, will create a bitmap compatible with the display
+ wxBitmap(int width, int height, int depth = -1);
- // Load a file or resource
- wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+ // 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); }
- // New constructor for generalised creation from data
- wxBitmap(void *data, long type, int width, int height, int depth = 1);
+ wxBitmap& operator=(const wxBitmap& bitmap)
+ {
+ if ( m_refData != bitmap.m_refData )
+ Ref(bitmap);
+ return *this;
+ }
- // If depth is omitted, will create a bitmap compatible with the display
- wxBitmap(int width, int height, int depth = -1);
+ wxBitmap& operator=(const wxIcon& icon)
+ {
+ (void)CopyFromIcon(icon);
- // 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);
+ return *this;
+ }
- ~wxBitmap();
+ virtual ~wxBitmap();
- 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);
+ // copies the contents and mask of the given (colour) icon to the bitmap
+ bool CopyFromIcon(const wxIcon& icon);
- inline bool Ok(void) const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
- inline int GetWidth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
- inline int GetHeight(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
- inline int GetDepth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
- inline int GetQuality(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_quality : 0); }
- void SetWidth(int w);
- void SetHeight(int h);
- void SetDepth(int d);
- void SetQuality(int q);
- void SetOk(bool isOk);
+ 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);
+
+ bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
+ int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
+ int GetHeight() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
+ int GetDepth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
+ int GetQuality() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_quality : 0); }
+ void SetWidth(int w);
+ void SetHeight(int h);
+ void SetDepth(int d);
+ void SetQuality(int q);
+ void SetOk(bool isOk);
#if WXWIN_COMPATIBILITY
- inline wxPalette *GetColourMap(void) const { return GetPalette(); }
- void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
+ wxPalette *GetColourMap() const { return GetPalette(); }
+ void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
#endif
- inline wxPalette* GetPalette(void) const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }
- void SetPalette(const wxPalette& palette);
+ wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }
+ void SetPalette(const wxPalette& palette);
- inline wxMask *GetMask(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }
- void SetMask(wxMask *mask) ;
+ wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }
+ void SetMask(wxMask *mask) ;
- inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
+ bool operator==(const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
+ bool operator!=(const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
- 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 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);
- // Format handling
- static inline wxList& GetHandlers(void) { 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);
+ static void InitStandardHandlers();
+ static void CleanUpHandlers();
- static void InitStandardHandlers();
- static void CleanUpHandlers();
protected:
- static wxList sm_handlers;
+ static wxList sm_handlers;
- // Implementation
+ // Implementation
public:
- void SetHBITMAP(WXHBITMAP bmp);
- inline WXHBITMAP GetHBITMAP(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
- inline void SetSelectedInto(wxDC *dc) { if (M_BITMAPDATA) M_BITMAPDATA->m_selectedInto = dc; }
- inline wxDC *GetSelectedInto(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_selectedInto : (wxDC*) NULL); }
- bool FreeResource(bool force = FALSE);
-
- // 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 <frederic.villeneuve@natinst.com>
- wxBitmap GetBitmapForDC(wxDC& dc) const;
+ void SetHBITMAP(WXHBITMAP bmp);
+ WXHBITMAP GetHBITMAP() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
+ void SetSelectedInto(wxDC *dc) { if (M_BITMAPDATA) M_BITMAPDATA->m_selectedInto = dc; }
+ wxDC *GetSelectedInto() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_selectedInto : (wxDC*) NULL); }
+ bool FreeResource(bool force = FALSE);
+
+ // 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 <frederic.villeneuve@natinst.com>
+ wxBitmap GetBitmapForDC(wxDC& dc) const;
+
+protected:
+ // common part of all ctors
+ void Init();
+private:
+ DECLARE_DYNAMIC_CLASS(wxBitmap)
};
#endif
wxList wxBitmap::sm_handlers;
-wxBitmap::wxBitmap()
+// this function should be called from all wxBitmap ctors
+void wxBitmap::Init()
{
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
-}
+ // m_refData = NULL; done in the base class ctor
-wxBitmap::wxBitmap(const wxIcon& icon)
-{
if ( wxTheBitmapList )
wxTheBitmapList->AddBitmap(this);
+}
+
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+ UnRef();
if ( !icon.Ok() )
- return;
+ return FALSE;
int width = icon.GetWidth(),
height = icon.GetHeight();
- HDC hdc = ::CreateCompatibleDC(NULL); // screen DC
- HBITMAP hbitmap = ::CreateCompatibleBitmap(hdc, width, height);
+ HICON hicon = (HICON) icon.GetHICON();
+
+ // GetIconInfo() doesn't exist under Win16 and I don't know any other way
+ // to create a bitmap from icon there - but using this way we won't have
+ // the mask (FIXME)
+#ifdef __WIN16__
+ // copy the icon to the bitmap
+ HDC hdcScreen = ::GetDC((HWND)NULL);
+ HDC hdc = ::CreateCompatibleDC(hdcScreen);
+ HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
- HICON hicon = (HICON) icon.GetHICON();
-#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
- ::DrawIconEx(hdc, 0, 0, hicon, width, height, 0, 0, DI_NORMAL);
-#else
::DrawIcon(hdc, 0, 0, hicon);
-#endif
::SelectObject(hdc, hbmpOld);
::DeleteDC(hdc);
+ ::ReleaseDC((HWND)NULL, hdcScreen);
+#else // Win32
+ ICONINFO iconInfo;
+ if ( !GetIconInfo(hicon, &iconInfo) )
+ {
+ wxLogLastError("GetIconInfo");
+
+ return FALSE;
+ }
+
+ HBITMAP hbitmap = iconInfo.hbmColor;
+
+ wxBitmap bmpMask(width, height, 1);
+ bmpMask.SetHBITMAP((WXHBITMAP)iconInfo.hbmMask);
+
+ SetMask(new wxMask(bmpMask));
+#endif // Win16/32
m_refData = new wxBitmapRefData;
+
M_BITMAPDATA->m_width = width;
M_BITMAPDATA->m_height = height;
M_BITMAPDATA->m_depth = wxDisplayDepth();
- M_BITMAPDATA->m_numColors = 0;
M_BITMAPDATA->m_hBitmap = (WXHBITMAP)hbitmap;
M_BITMAPDATA->m_ok = TRUE;
-}
-
-wxBitmap::wxBitmap(const wxBitmap& bitmap)
-{
- Ref(bitmap);
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ return TRUE;
}
wxBitmap::~wxBitmap()
{
if (wxTheBitmapList)
wxTheBitmapList->DeleteObject(this);
+
+ delete GetMask();
}
bool wxBitmap::FreeResource(bool WXUNUSED(force))
{
if ( !M_BITMAPDATA )
- return FALSE;
+ return FALSE;
wxASSERT_MSG( !M_BITMAPDATA->m_selectedInto,
wxT("freeing bitmap still selected into wxMemoryDC") );
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
{
- m_refData = new wxBitmapRefData;
+ Init();
- M_BITMAPDATA->m_width = the_width ;
- M_BITMAPDATA->m_height = the_height ;
- M_BITMAPDATA->m_depth = no_bits ;
- M_BITMAPDATA->m_numColors = 0;
+ m_refData = new wxBitmapRefData;
- M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits);
+ M_BITMAPDATA->m_width = the_width ;
+ M_BITMAPDATA->m_height = the_height ;
+ M_BITMAPDATA->m_depth = no_bits ;
+ M_BITMAPDATA->m_numColors = 0;
- if (M_BITMAPDATA->m_hBitmap)
- M_BITMAPDATA->m_ok = TRUE;
- else
- M_BITMAPDATA->m_ok = FALSE;
+ M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits);
- M_BITMAPDATA->m_selectedInto = NULL;
+ if (M_BITMAPDATA->m_hBitmap)
+ M_BITMAPDATA->m_ok = TRUE;
+ else
+ M_BITMAPDATA->m_ok = FALSE;
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ M_BITMAPDATA->m_selectedInto = NULL;
}
// Create from XPM data
wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem))
{
- (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+ Init();
+
+ (void)Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
wxBitmap::wxBitmap(int w, int h, int d)
{
- (void)Create(w, h, d);
+ Init();
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ (void)Create(w, h, d);
}
wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
{
- (void) Create(data, type, width, height, depth);
+ Init();
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ (void) Create(data, type, width, height, depth);
}
wxBitmap::wxBitmap(const wxString& filename, long type)
{
- LoadFile(filename, (int)type);
+ Init();
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ LoadFile(filename, (int)type);
}
bool wxBitmap::Create(int w, int h, int d)
projects / wxWidgets.git / commitdiff
