/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.h
+// Name: wx/os2/bitmap.h
// Purpose: wxBitmap class
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 11/28/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// 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"
+#include "wx/os2/private.h"
+#include "wx/os2/gdiimage.h"
#include "wx/gdicmn.h"
#include "wx/palette.h"
-// Bitmap
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxControl;
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxBitmapHandler;
class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxControl;
-// A mask is a mono bitmap used for drawing bitmaps
-// transparently.
-class WXDLLEXPORT wxMask: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxMask)
+// ----------------------------------------------------------------------------
+// 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:
- wxMask();
+ wxBitmapRefData();
+ virtual ~wxBitmapRefData() { Free(); }
- // Construct a mask from a bitmap and a colour indicating
- // the transparent area
- wxMask(const wxBitmap& bitmap, const wxColour& colour);
+ virtual void Free();
- // Construct a mask from a bitmap and a palette index indicating
- // the transparent area
- wxMask(const wxBitmap& bitmap, int paletteIndex);
+public:
+ int m_nNumColors;
+ wxPalette m_vBitmapPalette;
+ int m_nQuality;
- // Construct a mask from a mono bitmap (copies the bitmap).
- wxMask(const wxBitmap& bitmap);
+ // OS2-specific
+ // ------------
- ~wxMask();
+ wxDC* m_pSelectedInto;
- bool Create(const wxBitmap& bitmap, const wxColour& colour);
- bool Create(const wxBitmap& bitmap, int paletteIndex);
- bool Create(const wxBitmap& bitmap);
+ //
+ // Optional mask for transparent drawing
+ //
+ wxMask* m_pBitmapMask;
+}; // end of CLASS wxBitmapRefData
-/* TODO: platform-specific data access
- // Implementation
- inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
- inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
-protected:
- WXHBITMAP m_maskBitmap;
-*/
-};
+// ----------------------------------------------------------------------------
+// wxBitmap: a mono or colour bitmap
+// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
+class WXDLLEXPORT wxBitmap : public wxGDIImage
{
- friend class WXDLLEXPORT wxBitmap;
- friend class WXDLLEXPORT wxIcon;
- friend class WXDLLEXPORT wxCursor;
public:
- wxBitmapRefData();
- ~wxBitmapRefData();
+ // default ctor creates an invalid bitmap, you must Create() it later
+ wxBitmap() { Init(); }
+
+ // Copy constructors
+ inline wxBitmap(const wxBitmap& rBitmap)
+ { Init(); Ref(rBitmap); }
+
+ // Initialize with raw data
+ wxBitmap( const char bits[]
+ ,int nWidth
+ ,int nHeight
+ ,int nDepth = 1
+ );
+
+ // Initialize with XPM data
+ wxBitmap(const char** ppData);
+ wxBitmap(char** ppData);
+
+ // Load a file or resource
+ wxBitmap( const wxString& rName
+ ,long lType = wxBITMAP_TYPE_BMP_RESOURCE
+ );
+
+ // New constructor for generalised creation from data
+ wxBitmap( void* pData
+ ,long lType
+ ,int nWidth
+ ,int nHeight
+ ,int nDepth = 1
+ );
+
+ // If depth is omitted, will create a bitmap compatible with the display
+ wxBitmap( int nWidth
+ ,int nHeight
+ ,int nDepth = -1
+ );
+
+ // we must have this, otherwise icons are silently copied into bitmaps using
+ // the copy ctor but the resulting bitmap is invalid!
+ inline wxBitmap(const wxIcon& rIcon)
+ { Init(); CopyFromIcon(rIcon); }
+
+ wxBitmap& operator=(const wxBitmap& rBitmap)
+ {
+ if ( m_refData != rBitmap.m_refData )
+ Ref(rBitmap);
+ return(*this);
+ }
+
+ wxBitmap& operator=(const wxIcon& rIcon)
+ {
+ (void)CopyFromIcon(rIcon);
+
+ return(*this);
+ }
+
+ wxBitmap& operator=(const wxCursor& rCursor)
+ {
+ (void)CopyFromCursor(rCursor);
+ return (*this);
+ }
+
+ virtual ~wxBitmap();
+
+ // get the given part of bitmap
+ wxBitmap GetSubBitmap(const wxRect& rRect) const;
+
+ // copies the contents and mask of the given (colour) icon to the bitmap
+ bool CopyFromIcon(const wxIcon& rIcon);
+
+ // copies the contents and mask of the given cursor to the bitmap
+ bool CopyFromCursor(const wxCursor& rCursor);
+
+ virtual bool Create( int nWidth
+ ,int nHeight
+ ,int nDepth = -1
+ );
+ virtual bool Create( void* pData
+ ,long lType
+ ,int nWidth
+ ,int nHeight
+ ,int nDepth = 1
+ );
+ virtual bool LoadFile( const wxString& rName
+ ,long lType = wxBITMAP_TYPE_BMP_RESOURCE
+ );
+ virtual bool SaveFile( const wxString& rName
+ ,int lType
+ ,const wxPalette* pCmap = NULL
+ );
+
+ inline wxBitmapRefData* GetBitmapData() const
+ { return (wxBitmapRefData *)m_refData; }
+
+ inline int GetQuality() const
+ { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); }
+
+ void SetQuality(int nQ);
+
+ wxPalette* GetPalette() const
+ { return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : (wxPalette*) NULL); }
+
+ void SetPalette(const wxPalette& rPalette);
+
+ inline wxMask* GetMask() const
+ { return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : (wxMask*) NULL); }
+
+ void SetMask(wxMask* pMask) ;
+
+ inline bool operator==(const wxBitmap& rBitmap)
+ { return m_refData == rBitmap.m_refData; }
+
+ inline bool operator!=(const wxBitmap& rBitmap)
+ { return m_refData != rBitmap.m_refData; }
+
+#if WXWIN_COMPATIBILITY_2
+ void SetOk(bool bIsOk);
+#endif // WXWIN_COMPATIBILITY_2
+
+#if WXWIN_COMPATIBILITY
+ inline wxPalette* GetColourMap() const
+ { return GetPalette(); }
+
+ inline void SetColourMap(wxPalette* pCmap)
+ { SetPalette(*pCmap); };
+
+#endif // WXWIN_COMPATIBILITY
+ // Implementation
public:
- int m_width;
- int m_height;
- int m_depth;
- bool m_ok;
- int m_numColors;
- wxPalette m_bitmapPalette;
- int m_quality;
+ inline void SetHBITMAP(WXHBITMAP hBmp)
+ { SetHandle((WXHANDLE)hBmp); }
-/* WXHBITMAP m_hBitmap; TODO: platform-specific handle */
- wxMask * m_bitmapMask; // Optional mask
-};
+ inline WXHBITMAP GetHBITMAP() const
+ { return (WXHBITMAP)GetHandle(); }
+
+ inline void SetSelectedInto(wxDC* pDc)
+ { if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; }
+
+ inline wxDC* GetSelectedInto() const
+ { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
+
+ // An OS/2 version that probably doesn't do anything like the msw version
+ wxBitmap GetBitmapForDC(wxDC& rDc) const;
+
+// inline LONG GetId() const
+// { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
-#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
-class WXDLLEXPORT wxBitmapHandler: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-public:
- 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() const { return m_name; }
- inline wxString GetExtension() const { return m_extension; }
- inline long GetType() const { return m_type; }
protected:
- wxString m_name;
- wxString m_extension;
- long m_type;
-};
+ // common part of all ctors
+ void Init();
-#define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
+ inline virtual wxGDIImageRefData* CreateData() const
+ { return new wxBitmapRefData; }
-class WXDLLEXPORT wxBitmap: public wxGDIObject
-{
- DECLARE_DYNAMIC_CLASS(wxBitmap)
+ // creates the bitmap from XPM data, supposed to be called from ctor
+ bool CreateFromXpm(const char **bits);
+
+private:
+ bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
- friend class WXDLLEXPORT wxBitmapHandler;
+ DECLARE_DYNAMIC_CLASS(wxBitmap)
+}; // end of CLASS wxBitmap
+// ----------------------------------------------------------------------------
+// wxMask: a mono bitmap used for drawing bitmaps transparently.
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxMask : public wxObject
+{
public:
- wxBitmap(); // Platform-specific
-
- // Copy constructors
- inline wxBitmap(const wxBitmap& bitmap)
- { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
-
- // Initialize with raw data.
- wxBitmap(const char bits[], int width, int height, int depth = 1);
-
-/* TODO: maybe implement XPM reading
- // Initialize with XPM data
- wxBitmap(const char **data);
-*/
-
- // Load a file or resource
- // TODO: make default type whatever's appropriate for the platform.
- wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
-
- // Constructor for generalised creation from data
- wxBitmap(void *data, long type, int width, int height, int depth = 1);
-
- // If depth is omitted, will create a bitmap compatible with the display
- wxBitmap(int width, int height, int depth = -1);
- ~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);
-
- inline bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
- inline int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
- inline int GetHeight() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
- inline int GetDepth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
- inline 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);
-
- inline wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }
- void SetPalette(const wxPalette& palette);
-
- inline 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; }
- 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 inline 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);
-
- static void InitStandardHandlers();
- static void CleanUpHandlers();
+ wxMask();
+
+ // Construct a mask from a bitmap and a colour indicating the transparent
+ // area
+ wxMask( const wxBitmap& rBitmap
+ ,const wxColour& rColour
+ );
+
+ // Construct a mask from a bitmap and a palette index indicating the
+ // transparent area
+ wxMask( const wxBitmap& rBitmap
+ ,int nPaletteIndex
+ );
+
+ // Construct a mask from a mono bitmap (copies the bitmap).
+ wxMask(const wxBitmap& rBitmap);
+
+ // construct a mask from the givne bitmap handle
+ wxMask(WXHBITMAP hBmp)
+ { m_hMaskBitmap = hBmp; }
+
+ virtual ~wxMask();
+
+ bool Create( const wxBitmap& bitmap
+ ,const wxColour& rColour
+ );
+ bool Create( const wxBitmap& rBitmap
+ ,int nPaletteIndex
+ );
+ bool Create(const wxBitmap& rBitmap);
+
+ // Implementation
+ WXHBITMAP GetMaskBitmap() const
+ { return m_hMaskBitmap; }
+ void SetMaskBitmap(WXHBITMAP hBmp)
+ { m_hMaskBitmap = hBmp; }
+
protected:
- static wxList sm_handlers;
+ WXHBITMAP m_hMaskBitmap;
+ DECLARE_DYNAMIC_CLASS(wxMask)
+}; // end of CLASS wxMask
-/*
- // TODO: Implementation
+// ----------------------------------------------------------------------------
+// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler
+{
public:
- void SetHBITMAP(WXHBITMAP bmp);
- inline WXHBITMAP GetHBITMAP() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
- bool FreeResource(bool force = FALSE);
-*/
+ inline wxBitmapHandler()
+ { m_lType = wxBITMAP_TYPE_INVALID; }
+
+ inline wxBitmapHandler( const wxString& rName
+ ,const wxString& rExt
+ ,long lType
+ )
+ : wxGDIImageHandler( rName
+ ,rExt
+ ,lType)
+ {
+ }
+
+ // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
+ // old class which worked only with bitmaps
+ virtual bool Create( wxBitmap* pBitmap
+ ,void* pData
+ ,long lFlags
+ ,int nWidth
+ ,int nHeight
+ ,int nDepth = 1
+ );
+ virtual bool LoadFile( wxBitmap* pBitmap
+ ,const wxString& rName
+ ,HPS hPs
+ ,long lFlags
+ ,int nDesiredWidth
+ ,int nDesiredHeight
+ );
+ virtual bool SaveFile( wxBitmap* pBitmap
+ ,const wxString& rName
+ ,int lType
+ ,const wxPalette* pPalette = NULL
+ );
+
+ virtual bool Create( wxGDIImage* pImage
+ ,void* pData
+ ,long lFlags
+ ,int nWidth
+ ,int nHeight
+ ,int nDepth = 1
+ );
+ virtual bool Load( wxGDIImage* pImage
+ ,const wxString& rName
+ ,HPS hPs
+ ,long lFlags
+ ,int nDesiredWidth
+ ,int nDesiredHeight
+ );
+ virtual bool Save( wxGDIImage* pImage
+ ,const wxString& rName
+ ,int lType
+ );
+private:
+ DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+}; // end of CLASS wxBitmapHandler
-};
#endif
// _WX_BITMAP_H_
projects / wxWidgets.git / blobdiff