cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added deep copy of bitmaps.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2006-11-04 18:52:56 +00:00
parent c98826242f
commit a4e15a8d05
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/private.h
View File

@ -287,7 +287,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
// OS/2 convention of the mask is opposed to the wxWidgets one, so we need // OS/2 convention of the mask is opposed to the wxWidgets one, so we need
// to invert the mask each time we pass one/get one to/from Windows // to invert the mask each time we pass one/get one to/from Windows
extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
extern HBITMAP wxFlipBmp(HBITMAP hbmp, int w = 0, int h = 0); extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0);
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// global data // global data

16
src/os2/bitmap.cpp
View File

@ -67,8 +67,7 @@ wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
if (tocopy.m_pBitmapMask) if (tocopy.m_pBitmapMask)
m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask); m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask);
// TODO: how to copy an HBITMAP? m_hBitmap = wxCopyBmp(tocopy.m_hBitmap);
m_hBitmap = tocopy.m_hBitmap;
} }
void wxBitmapRefData::Free() void wxBitmapRefData::Free()
@ -1222,8 +1221,7 @@ wxMask::wxMask()
wxMask::wxMask(const wxMask& tocopy) wxMask::wxMask(const wxMask& tocopy)
{ {
// TODO: how to copy a WXHBITMAP? m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap);
m_hMaskBitmap = tocopy.m_hMaskBitmap;
} // end of wxMask::wxMask } // end of wxMask::wxMask
// Construct a mask from a bitmap and a colour indicating // Construct a mask from a bitmap and a colour indicating
@ -1628,9 +1626,9 @@ HBITMAP wxInvertMask(
return hBmpInvMask; return hBmpInvMask;
} // end of WxWinGdi_InvertMask } // 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, _T("invalid bitmap in wxCopyBmp") );
// //
// Get width/height from the bitmap if not given // Get width/height from the bitmap if not given
@ -1673,7 +1671,11 @@ HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
{nWidth, 0}, {nWidth, 0},
{0, 0}, {0, 0},
{nWidth, nHeight} }; {nWidth, nHeight} };
if (!flip)
{
vPoint[0].y = 0;
vPoint[1].y = nHeight;
}
memset(&vBmih, '\0', 16); memset(&vBmih, '\0', 16);
vBmih.cbFix = 16; vBmih.cbFix = 16;
vBmih.cx = nWidth; vBmih.cx = nWidth;

2
src/os2/notebook.cpp
View File

@ -337,7 +337,7 @@ bool wxNotebook::SetPageImage (
return (bool)::WinSendMsg( GetHWND() return (bool)::WinSendMsg( GetHWND()
,BKM_SETTABBITMAP ,BKM_SETTABBITMAP
,MPFROMLONG((ULONG)m_alPageId[nPage]) ,MPFROMLONG((ULONG)m_alPageId[nPage])
,(MPARAM)wxFlipBmp(vBitmap.GetHBITMAP()) ,(MPARAM)wxCopyBmp(vBitmap.GetHBITMAP(), true)
); );
} // end of wxNotebook::SetPageImage } // end of wxNotebook::SetPageImage