class WXDLLEXPORT wxControl;
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxBitmapHandler;
+class WXDLLEXPORT wxBitmapRefData;
class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxCursor;
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxPalette;
-// ----------------------------------------------------------------------------
-// Bitmap data
-//
-// NB: this class is private, but declared here to make it possible inline
-// wxBitmap functions accessing it
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
-{
-public:
- wxBitmapRefData();
- virtual ~wxBitmapRefData() { Free(); }
-
- virtual void Free();
-
-public:
- int m_numColors;
-#if wxUSE_PALETTE
- wxPalette m_bitmapPalette;
-#endif // wxUSE_PALETTE
- int m_quality;
-
- // MSW-specific
- // ------------
-
- // this field is solely for error checking: we detect selecting a bitmap
- // into more than one DC at once or deleting a bitmap still selected into a
- // DC (both are serious programming errors under Windows)
- wxDC *m_selectedInto;
-
- // optional mask for transparent drawing
- wxMask *m_bitmapMask;
-
-#if wxUSE_DIB_FOR_BITMAP
- WXHANDLE m_hFileMap; // file mapping handle for large DIB's
-#endif
-
-
- DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-};
-
// ----------------------------------------------------------------------------
// wxBitmap: a mono or colour bitmap
// ----------------------------------------------------------------------------
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; }
-
- int GetQuality() const { return (GetBitmapData() ? GetBitmapData()->m_quality : 0); }
- void SetQuality(int q);
+ wxBitmapRefData *GetBitmapData() const
+ { return (wxBitmapRefData *)m_refData; }
#if wxUSE_PALETTE
- wxPalette* GetPalette() const { return (GetBitmapData() ? (& GetBitmapData()->m_bitmapPalette) : (wxPalette*) NULL); }
+ wxPalette* GetPalette() const;
void SetPalette(const wxPalette& palette);
#endif // wxUSE_PALETTE
- wxMask *GetMask() const { return (GetBitmapData() ? GetBitmapData()->m_bitmapMask : (wxMask*) NULL); }
+ 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
+
+#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
void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); }
WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); }
-#if wxUSE_DIB_FOR_BITMAP
- void SetHFileMap(WXHANDLE hFileMap) { GetBitmapData()->m_hFileMap = hFileMap; }
- WXHANDLE GetHFileMap() const { return GetBitmapData()->m_hFileMap; }
-#endif // wxUSE_DIB_FOR_BITMAP
-
- void SetSelectedInto(wxDC *dc) { if (GetBitmapData()) GetBitmapData()->m_selectedInto = dc; }
- wxDC *GetSelectedInto() const { return (GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC*) NULL); }
+ 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
// common part of all ctors
void Init();
- virtual wxGDIImageRefData *CreateData() const
- { return new wxBitmapRefData; }
+ virtual wxGDIImageRefData *CreateData() const;
// creates the bitmap from XPM data, supposed to be called from ctor
bool CreateFromXpm(const char **bits);
#if wxUSE_DIB_FOR_BITMAP
void *CreateDIB(int width, int height, int depth);
+
void CopyDIBLine(void* src, void* dest, int count) const;
-#endif
+#endif // wxUSE_DIB_FOR_BITMAP
private:
#ifdef __WIN32__
#include "wx/icon.h"
#endif
-//#include "device.h"
-
#include "wx/msw/private.h"
#include "wx/log.h"
#define CLR_INVALID ((COLORREF)-1)
#endif // no CLR_INVALID
+// ----------------------------------------------------------------------------
+// Bitmap data
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
+{
+public:
+ wxBitmapRefData();
+ virtual ~wxBitmapRefData() { Free(); }
+
+ virtual void Free();
+
+ // set the mask object to use as the mask, we take ownership of it
+ void SetMask(wxMask *mask)
+ {
+ delete m_bitmapMask;
+ m_bitmapMask = mask;
+ }
+
+ // set the HBITMAP to use as the mask
+ void SetMask(HBITMAP hbmpMask)
+ {
+ SetMask(new wxMask((WXHBITMAP)hbmpMask));
+ }
+
+ // return the mask
+ wxMask *GetMask() const { return m_bitmapMask; }
+
+public:
+ int m_numColors;
+#if wxUSE_PALETTE
+ wxPalette m_bitmapPalette;
+#endif // wxUSE_PALETTE
+
+ // MSW-specific
+ // ------------
+
+ // this field is solely for error checking: we detect selecting a bitmap
+ // into more than one DC at once or deleting a bitmap still selected into a
+ // DC (both are serious programming errors under Windows)
+ wxDC *m_selectedInto;
+
+#if wxUSE_DIB_FOR_BITMAP
+ // file mapping handle for large DIB's
+ HANDLE m_hFileMap;
+#endif // wxUSE_DIB_FOR_BITMAP
+
+private:
+ // optional mask for transparent drawing
+ wxMask *m_bitmapMask;
+
+ DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+};
+
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
wxBitmapRefData::wxBitmapRefData()
{
- m_quality = 0;
m_selectedInto = NULL;
m_numColors = 0;
m_bitmapMask = NULL;
m_hBitmap = (WXHBITMAP) NULL;
#if wxUSE_DIB_FOR_BITMAP
m_hFileMap = 0;
-#endif
+#endif // wxUSE_DIB_FOR_BITMAP
}
void wxBitmapRefData::Free()
if ( m_hBitmap)
{
- // printf("About to delete bitmap %d\n", (int) (HBITMAP) m_hBitmap);
-#if 1
if ( !::DeleteObject((HBITMAP)m_hBitmap) )
{
wxLogLastError(wxT("DeleteObject(hbitmap)"));
}
-#endif
}
#if wxUSE_DIB_FOR_BITMAP
- if(m_hFileMap)
+ if ( m_hFileMap )
{
- ::CloseHandle((void*)m_hFileMap);
+ ::CloseHandle(m_hFileMap);
+
m_hFileMap = 0;
}
-#endif
+#endif // wxUSE_DIB_FOR_BITMAP
delete m_bitmapMask;
m_bitmapMask = NULL;
}
+wxGDIImageRefData *wxBitmap::CreateData() const
+{
+ return new wxBitmapRefData;
+}
+
#ifdef __WIN32__
bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
// the mask returned by GetIconInfo() is inversed compared to the usual
// wxWin convention
- refData->m_bitmapMask = new wxMask((WXHBITMAP)
- wxInvertMask(iconInfo.hbmMask, w, h));
+ refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
// delete the old one now as we don't need it any more
info->bmiHeader.biYPelsPerMeter = 0;
info->bmiHeader.biClrUsed = 0;
info->bmiHeader.biClrImportant = 0;
- GetBitmapData()->m_hFileMap =
- (WXHANDLE)::CreateFileMapping
- (
- INVALID_HANDLE_VALUE,
- 0,
- PAGE_READWRITE | SEC_COMMIT,
- 0,
- info->bmiHeader.biSizeImage,
- 0
- );
+ GetBitmapData()->m_hFileMap = ::CreateFileMapping
+ (
+ INVALID_HANDLE_VALUE,
+ 0,
+ PAGE_READWRITE | SEC_COMMIT,
+ 0,
+ info->bmiHeader.biSizeImage,
+ 0
+ );
// No need to report an error here. If it fails, we just won't use a
// file mapping and CreateDIBSection will just allocate memory for us.
info,
DIB_RGB_COLORS,
&dibBits,
- (HANDLE)GetBitmapData()->m_hFileMap,
+ GetBitmapData()->m_hFileMap,
0
);
::SelectObject(hMaskDC, hOldMaskBitmap);
::DeleteDC(hMaskDC);
- ((wxBitmapRefData*)m_refData)->m_bitmapMask = new wxMask((WXHBITMAP) hMaskBitmap);
+ ((wxBitmapRefData*)m_refData)->SetMask(hMaskBitmap);
}
SetWidth(image.GetWidth());
// wxBitmap accessors
// ----------------------------------------------------------------------------
-void wxBitmap::SetQuality(int q)
+wxPalette* wxBitmap::GetPalette() const
{
- EnsureHasData();
+ return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
+ : (wxPalette *) NULL;
+}
- GetBitmapData()->m_quality = q;
+wxMask *wxBitmap::GetMask() const
+{
+ return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
}
-#if WXWIN_COMPATIBILITY_2
-void wxBitmap::SetOk(bool isOk)
+wxDC *wxBitmap::GetSelectedInto() const
{
- EnsureHasData();
+ return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
+}
- GetBitmapData()->m_ok = isOk;
+#if wxUSE_DIB_FOR_BITMAP
+
+bool wxBitmap::IsDIB() const
+{
+ return GetBitmapData() && GetBitmapData()->m_hFileMap != NULL;
+}
+
+#endif // wxUSE_DIB_FOR_BITMAP
+
+#if WXWIN_COMPATIBILITY_2_4
+
+int wxBitmap::GetQuality() const
+{
+ return 0;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// wxBitmap setters
+// ----------------------------------------------------------------------------
+
+void wxBitmap::SetSelectedInto(wxDC *dc)
+{
+ if ( GetBitmapData() )
+ GetBitmapData()->m_selectedInto = dc;
}
-#endif // WXWIN_COMPATIBILITY_2
#if wxUSE_PALETTE
{
EnsureHasData();
- GetBitmapData()->m_bitmapMask = mask;
+ GetBitmapData()->SetMask(mask);
+}
+
+#if WXWIN_COMPATIBILITY_2
+
+void wxBitmap::SetOk(bool isOk)
+{
+ EnsureHasData();
+
+ GetBitmapData()->m_ok = isOk;
+}
+
+#endif // WXWIN_COMPATIBILITY_2
+
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::SetQuality(int WXUNUSED(quality))
+{
}
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// TODO: to be replaced by something better
+// ----------------------------------------------------------------------------
+
// Creates a bitmap that matches the device context, from
// an arbitray bitmap. At present, the original bitmap must have an
// associated palette. TODO: use a default palette if no palette exists.
projects / wxWidgets.git / commitdiff
