#include "wx/image.h"
#endif
+#include "wx/os2/dc.h"
#include "wx/os2/private.h"
#include "wx/xpmdecod.h"
m_hBitmap = (WXHBITMAP) NULL;
} // end of wxBitmapRefData::wxBitmapRefData
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
+{
+ m_nQuality = tocopy.m_nQuality;
+ m_pSelectedInto = NULL; // don't copy this
+ m_nNumColors = tocopy.m_nNumColors;
+
+ // copy the mask
+ if (tocopy.m_pBitmapMask)
+ m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask);
+
+ m_hBitmap = wxCopyBmp(tocopy.m_hBitmap);
+}
+
void wxBitmapRefData::Free()
{
if ( m_pSelectedInto )
wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
}
}
- if (m_pBitmapMask)
- {
- delete m_pBitmapMask;
- m_pBitmapMask = NULL;
- }
+ wxDELETE(m_pBitmapMask);
} // end of wxBitmapRefData::Free
// ----------------------------------------------------------------------------
// wxBitmap creation
// ----------------------------------------------------------------------------
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
+{
+ return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
+}
+
// this function should be called from all wxBitmap ctors
void wxBitmap::Init()
{
{
UnRef();
- if (!rCursor.Ok())
+ if (!rCursor.IsOk())
return(false);
return(CopyFromIconOrCursor(rCursor));
} // end of wxBitmap::CopyFromCursor
{
UnRef();
- if (!rIcon.Ok())
+ if (!rIcon.IsOk())
return(false);
return CopyFromIconOrCursor(rIcon);
} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
- int nW
-, int nH
-, int nD
-)
-{
- Init();
- (void)Create( nW
- ,nH
- ,nD
- );
-} // end of wxBitmap::wxBitmap
-
-wxBitmap::wxBitmap(
- void* pData
-, long lType
+ const void* pData
+, wxBitmapType lType
, int nWidth
, int nHeight
, int nDepth
wxBitmap::wxBitmap(
int nId
-, long lType
+, wxBitmapType lType
)
{
Init();
LoadFile( nId
- ,(int)lType
+ ,lType
);
SetId(nId);
} // end of wxBitmap::wxBitmap
}
SetHBITMAP((WXHBITMAP)hBmp);
- return Ok();
+ return IsOk();
} // end of wxBitmap::Create
-bool wxBitmap::CreateFromXpm(
- const char** ppData
-)
-{
-#if wxUSE_IMAGE && wxUSE_XPM
- Init();
-
- wxCHECK_MSG(ppData != NULL, false, wxT("invalid bitmap data"));
-
- wxXPMDecoder vDecoder;
- wxImage vImg = vDecoder.ReadData(ppData);
-
- wxCHECK_MSG(vImg.Ok(), false, wxT("invalid bitmap data"));
-
- *this = wxBitmap(vImg);
- return true;
-#else
- return false;
-#endif
-} // end of wxBitmap::CreateFromXpm
-
-bool wxBitmap::LoadFile(const wxString& filename, long type)
+bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
{
UnRef();
else // no bitmap handler found
{
wxImage image;
- if ( image.LoadFile( filename, type ) && image.Ok() )
+ if ( image.LoadFile( filename, type ) && image.IsOk() )
{
*this = wxBitmap(image);
bool wxBitmap::LoadFile(
int nId
-, long lType
+, wxBitmapType lType
)
{
UnRef();
} // end of wxBitmap::LoadFile
bool wxBitmap::Create(
- void* pData
-, long lType
+ const void* pData
+, wxBitmapType lType
, int nWidth
, int nHeight
, int nDepth
bool wxBitmap::SaveFile(
const wxString& rFilename
-, int lType
+, wxBitmapType lType
, const wxPalette* pPalette
)
{
// FIXME what about palette? shouldn't we use it?
wxImage vImage = ConvertToImage();
- if (!vImage.Ok())
+ if (!vImage.IsOk())
return false;
return(vImage.SaveFile( rFilename
, int nDepth
)
{
- wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
+ wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image"));
m_refData = new wxBitmapRefData();
int nSizeLimit = 1024 * 768 * 3;
//
// Set bitmap parameters
//
- wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
+ wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image"));
SetWidth(nWidth);
SetHeight(nBmpHeight);
if (nDepth == 1)
);
#if wxUSE_PALETTE
HPAL hOldPalette = NULLHANDLE;
- if (rImage.GetPalette().Ok())
+ if (rImage.GetPalette().IsOk())
{
hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE());
}
wxImage vImage;
wxDC* pDC;
- wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
//
// Create an wxImage object
//
// May already be selected into a PS
//
- if ((pDC = GetSelectedInto()) != NULL)
+ pDC = GetSelectedInto();
+ const wxPMDCImpl *impl;
+ if (pDC != NULL &&
+ (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
{
- hPSMem = pDC->GetHPS();
+ hPSMem = impl->GetHPS();
}
else
{
const wxRect& rRect
) const
{
- wxCHECK_MSG( Ok() &&
+ wxCHECK_MSG( IsOk() &&
(rRect.x >= 0) && (rRect.y >= 0) &&
(rRect.x + rRect.width <= GetWidth()) &&
(rRect.y + rRect.height <= GetHeight()),
,rRect.height
,GetDepth()
);
- wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") );
+ wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") );
//
m_hMaskBitmap = 0;
} // end of wxMask::wxMask
+wxMask::wxMask(const wxMask& tocopy)
+{
+ m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap);
+} // end of wxMask::wxMask
+
// Construct a mask from a bitmap and a colour indicating
// the transparent area
wxMask::wxMask(
::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
m_hMaskBitmap = 0;
}
- if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
+ if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1)
{
return false;
}
::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
m_hMaskBitmap = 0;
}
- if (rBitmap.Ok() && rBitmap.GetPalette()->Ok())
+ if (rBitmap.IsOk() && rBitmap.GetPalette()->IsOk())
{
unsigned char cRed;
unsigned char cGreen;
::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
m_hMaskBitmap = 0;
}
- if (!rBitmap.Ok())
+ if (!rBitmap.IsOk())
{
return false;
}
// ----------------------------------------------------------------------------
bool wxBitmapHandler::Create( wxGDIImage* pImage,
- void* pData,
- long WXUNUSED(lFlags),
+ const void* pData,
+ wxBitmapType lType,
int nWidth,
int nHeight,
int nDepth)
return(pBitmap ? Create( pBitmap
,pData
+ ,lType
,nWidth
,nHeight
,nDepth
bool wxBitmapHandler::Load(
wxGDIImage* pImage
, int nId
-, long lFlags
+, wxBitmapType lFlags
, int nWidth
, int nHeight
)
}
bool wxBitmapHandler::Save(
- wxGDIImage* pImage
+ const wxGDIImage* pImage
, const wxString& rName
-, int lType
-)
+, wxBitmapType lType
+) const
{
wxBitmap* pBitmap = wxDynamicCast( pImage
,wxBitmap
bool wxBitmapHandler::Create(
wxBitmap* WXUNUSED(pBitmap)
-, void* WXUNUSED(pData)
-, long WXUNUSED(lType)
+, const void* WXUNUSED(pData)
+, wxBitmapType WXUNUSED(lType)
, int WXUNUSED(nWidth)
, int WXUNUSED(nHeight)
, int WXUNUSED(nDepth)
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
, int WXUNUSED(nId)
-, long WXUNUSED(lType)
+, wxBitmapType WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)
)
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
, const wxString& WXUNUSED(rName)
-, long WXUNUSED(lType)
+, wxBitmapType WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)
)
bool wxBitmapHandler::SaveFile(
wxBitmap* WXUNUSED(pBitmap)
, const wxString& WXUNUSED(rName)
-, int WXUNUSED(nType)
+, wxBitmapType WXUNUSED(nType)
, const wxPalette* WXUNUSED(pPalette)
-)
+) const
{
return false;
}
{
HBITMAP hBmpInvMask = 0;
- wxCHECK_MSG( hBmpMask, 0, _T("invalid bitmap in wxInvertMask") );
+ wxCHECK_MSG( hBmpMask, 0, wxT("invalid bitmap in wxInvertMask") );
//
// Get width/height from the bitmap if not given
return hBmpInvMask;
} // end of WxWinGdi_InvertMask
-HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
+HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight )
{
- wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxFlipBmp") );
+ wxCHECK_MSG( hBmp, 0, wxT("invalid bitmap in wxCopyBmp") );
//
// Get width/height from the bitmap if not given
{nWidth, 0},
{0, 0},
{nWidth, nHeight} };
-
+ if (!flip)
+ {
+ vPoint[0].y = 0;
+ vPoint[1].y = nHeight;
+ }
memset(&vBmih, '\0', 16);
vBmih.cbFix = 16;
vBmih.cx = nWidth;
projects / wxWidgets.git / blobdiff