m_pSelectedInto = NULL;
m_nNumColors = 0;
m_pBitmapMask = NULL;
- m_hBitmap = (WXHBITMAP) NULL;
+ m_hBitmap = (WXHBITMAP) NULL;
} // end of wxBitmapRefData::wxBitmapRefData
void wxBitmapRefData::Free()
{
- wxASSERT_MSG( !m_pSelectedInto,
- wxT("deleting bitmap still selected into wxMemoryDC") );
-
+ if ( m_pSelectedInto )
+ {
+ wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
+ }
if (m_hBitmap)
{
- if ( !::GpiDeleteBitmap((HBITMAP)m_hBitmap) )
+ if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap))
{
- wxLogLastError("GpiDeleteBitmap(hbitmap)");
+ wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
}
}
-
- delete m_pBitmapMask;
- m_pBitmapMask = NULL;
+ if (m_pBitmapMask)
+ {
+ delete m_pBitmapMask;
+ m_pBitmapMask = NULL;
+ }
} // end of wxBitmapRefData::Free
// ----------------------------------------------------------------------------
// this function should be called from all wxBitmap ctors
void wxBitmap::Init()
{
- // m_refData = NULL; done in the base class ctor
-
- if (wxTheBitmapList)
- wxTheBitmapList->AddBitmap(this);
+ m_bIsMono = false;
+ //
+ // True for all bitmaps created from bits, wxImages, Xpms
+ //
} // end of wxBitmap::Init
bool wxBitmap::CopyFromIconOrCursor(
if (!::WinQueryPointerInfo(hIcon, &SIconInfo))
{
wxLogLastError(wxT("WinQueryPointerInfo"));
- return FALSE;
+ return false;
}
wxBitmapRefData* pRefData = new wxBitmapRefData;
pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor;
- //
- // No mask in the Info struct in OS/2
- //
- return(TRUE);
+ wxMask* pMask = new wxMask(SIconInfo.hbmPointer);
+
+ pMask->SetMaskBitmap(GetHBITMAP());
+ SetMask(pMask);
+
+ return true;
} // end of wxBitmap::CopyFromIconOrCursor
bool wxBitmap::CopyFromCursor(
UnRef();
if (!rCursor.Ok())
- return(FALSE);
+ return(false);
return(CopyFromIconOrCursor(rCursor));
} // end of wxBitmap::CopyFromCursor
UnRef();
if (!rIcon.Ok())
- return(FALSE);
+ return(false);
return CopyFromIconOrCursor(rIcon);
} // end of wxBitmap::CopyFromIcon
wxBitmap::~wxBitmap()
{
- if (wxTheBitmapList)
- wxTheBitmapList->DeleteObject(this);
} // end of wxBitmap::~wxBitmap
wxBitmap::wxBitmap(
const char zBits[]
-, int nTheWidth
-, int nTheHeight
-, int nNoBits
+, int nWidth
+, int nHeight
+, int nDepth
)
{
Init();
HPS hPs;
DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
SIZEL vSize = {0, 0};
+ char* pzData;
wxASSERT(vHabmain != NULL);
- hDc = ::DevOpenDC(vHabmain, OD_MEMORY, (PSZ)"*", 1L, (PDEVOPENDATA)&vDop, 0L);
+ m_refData = pRefData;
- vHeader.cbFix = sizeof(vHeader);
- vHeader.cx = (USHORT)nTheWidth;
- vHeader.cy = (USHORT)nTheHeight;
- vHeader.cPlanes = 1L;
- vHeader.cBitCount = nNoBits;
- vHeader.ulCompression = BCA_UNCOMP;
- vHeader.cxResolution = 0;
- vHeader.cyResolution = 0;
- vHeader.cclrUsed = 0;
- vHeader.cclrImportant = 0;
- vHeader.usUnits = BRU_METRIC;
- vHeader.usRecording = BRA_BOTTOMUP;
- vHeader.usRendering = BRH_NOTHALFTONED;
- vHeader.cSize1 = 0;
- vHeader.cSize2 = 0;
- vHeader.ulColorEncoding = 0;
- vHeader.ulIdentifier = 0;
+ pRefData->m_nWidth = nWidth;
+ pRefData->m_nHeight = nHeight;
+ pRefData->m_nDepth = nDepth;
+ pRefData->m_nNumColors = 0;
+ pRefData->m_pSelectedInto = NULL;
+ hDc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS);
if (hPs == 0)
{
- wxLogLastError("GpiCreatePS Failure");
+ wxLogLastError(wxT("GpiCreatePS Failure"));
}
- m_refData = pRefData;
+ if (nDepth == 1)
+ {
+ //
+ // We assume that it is in XBM format which is not quite the same as
+ // the format CreateBitmap() wants because the order of bytes in the
+ // line is reversed!
+ //
+ const size_t nBytesPerLine = (nWidth + 7) / 8;
+ const size_t nPadding = nBytesPerLine % 2;
+ const size_t nLen = nHeight * (nPadding + nBytesPerLine);
+ const char* pzSrc = zBits;
+ int nRows;
+ size_t nCols;
+
+ pzData = (char *)malloc(nLen);
+
+ char* pzDst = pzData;
+
+ for (nRows = 0; nRows < nHeight; nRows++)
+ {
+ for (nCols = 0; nCols < nBytesPerLine; nCols++)
+ {
+ unsigned char ucVal = *pzSrc++;
+ unsigned char ucReversed = 0;
+ int nBits;
- pRefData->m_nWidth = nTheWidth;
- pRefData->m_nHeight = nTheHeight;
- pRefData->m_nDepth = nNoBits;
- pRefData->m_nNumColors = 0;
- pRefData->m_pSelectedInto = NULL;
+ for (nBits = 0; nBits < 8; nBits++)
+ {
+ ucReversed <<= 1;
+ ucReversed = (unsigned char)(ucReversed | (ucVal & 0x01));
+ ucVal >>= 1;
+ }
+ *pzDst++ = ucReversed;
+ }
+ if (nPadding)
+ *pzDst++ = 0;
+ }
+ }
+ else
+ {
+ //
+ // Bits should already be in Windows standard format
+ //
+ pzData = (char *)zBits; // const_cast is harmless
+ }
+
+ if (nDepth > 24)
+ nDepth = 24; // MAX supported in PM
+ memset(&vHeader, '\0', 16);
+ vHeader.cbFix = 16;
+ vHeader.cx = (USHORT)nWidth;
+ vHeader.cy = (USHORT)nHeight;
+ vHeader.cPlanes = 1L;
+ vHeader.cBitCount = (USHORT)nDepth;
+ vHeader.usReserved = 0;
+
+ memset(&vInfo, '\0', 16);
+ vInfo.cbFix = 16;
+ vInfo.cx = (USHORT)nWidth;
+ vInfo.cy = (USHORT)nHeight;
+ vInfo.cPlanes = 1L;
+ vInfo.cBitCount = (USHORT)nDepth;
+
+ HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo);
- HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, 0L, NULL, &vInfo);
if (!hBmp)
{
- wxLogLastError("CreateBitmap");
+ wxLogLastError(wxT("CreateBitmap"));
}
+ ::GpiDestroyPS(hPs);
+ ::DevCloseDC(hDc);
SetHBITMAP((WXHBITMAP)hBmp);
} // end of wxBitmap::wxBitmap
)
{
Init();
-
(void)Create( nW
,nH
,nD
} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
- const wxString& rFilename
+ int nId
, long lType
)
{
Init();
-
- LoadFile( rFilename
+ LoadFile( nId
,(int)lType
);
+ SetId(nId);
} // end of wxBitmap::wxBitmap
bool wxBitmap::Create(
GetBitmapData()->m_nHeight = nH;
GetBitmapData()->m_nDepth = nD;
+ //
+ // Xpms and bitmaps from other images can also be mono's, but only
+ // mono's need help changing their colors with MemDC changes
+ //
if (nD > 0)
{
DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
- memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
- vHeader.cbFix = sizeof(BITMAPINFOHEADER2);
+ if (nD == 1)
+ m_bIsMono = true;
+ memset(&vHeader, '\0', 16);
+ vHeader.cbFix = 16;
vHeader.cx = nW;
vHeader.cy = nH;
vHeader.cPlanes = 1;
- vHeader.cBitCount = nD;
+ vHeader.cBitCount = 24; //nD;
hBmp = ::GpiCreateBitmap( hPS
,&vHeader
hDCScreen = ::GpiQueryDevice(hPSScreen);
::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount);
- memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
- vHeader.cbFix = sizeof(BITMAPINFOHEADER2);
+ if (lBitCount > 24)
+ lBitCount = 24;
+
+ memset(&vHeader, '\0', 16);
+ vHeader.cbFix = 16;
vHeader.cx = nW;
vHeader.cy = nH;
vHeader.cPlanes = 1;
- vHeader.cBitCount = lBitCount;
+ vHeader.cBitCount = (USHORT)lBitCount;
hBmp = ::GpiCreateBitmap( hPSScreen
,&vHeader
}
SetHBITMAP((WXHBITMAP)hBmp);
-#if WXWIN_COMPATIBILITY_2
- GetBitmapData()->m_bOk = hBmp != 0;
-#endif // WXWIN_COMPATIBILITY_2
-
return Ok();
} // end of wxBitmap::Create
#if wxUSE_IMAGE && wxUSE_XPM
Init();
- wxCHECK_MSG(ppData != NULL, FALSE, wxT("invalid bitmap data"))
+ 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"))
+ wxCHECK_MSG(vImg.Ok(), false, wxT("invalid bitmap data"))
*this = wxBitmap(vImg);
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
} // end of wxBitmap::CreateFromXpm
bool wxBitmap::LoadFile(
- const wxString& rFilename
+ int nId
, long lType
)
{
- HPS hPs = NULLHANDLE;
-
UnRef();
wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType)
m_refData = new wxBitmapRefData;
return(pHandler->LoadFile( this
- ,rFilename
- ,hPs
+ ,nId
,lType
, -1
, -1
}
else
{
- wxImage vImage;
-
- if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() )
- return(FALSE);
-
- *this = wxBitmap(vImage);
-
- return(TRUE);
+ return false;
}
} // end of wxBitmap::LoadFile
if (!pHandler)
{
- wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for "
- "type %d defined."), lType);
+ wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), lType);
- return(FALSE);
+ return false;
}
m_refData = new wxBitmapRefData;
wxImage vImage = ConvertToImage();
if (!vImage.Ok())
- return(FALSE);
+ return false;
return(vImage.SaveFile( rFilename
,lType
// ----------------------------------------------------------------------------
-// wxImage-wxBitmap convertion
+// wxImage-wxBitmap conversion
// ----------------------------------------------------------------------------
-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+bool wxBitmap::CreateFromImage (
+ const wxImage& rImage
+, int nDepth
+)
{
- wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
-
-// TODO:
-/*
- int sizeLimit = 1024*768*3;
-
- // width and height of the device-dependent bitmap
- int width = GetWidth();
- int bmpHeight = GetHeight();
-
- // calc the number of bytes per scanline and padding
- int bytePerLine = width*3;
- int sizeDWORD = sizeof( DWORD );
- int lineBoundary = bytePerLine % sizeDWORD;
- int padding = 0;
- if( lineBoundary > 0 )
+ wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
+ m_refData = new wxBitmapRefData();
+
+ int nSizeLimit = 1024 * 768 * 3;
+ int nWidth = rImage.GetWidth();
+ int nBmpHeight = rImage.GetHeight();
+ int nBytePerLine = nWidth * 3;
+ int nSizeDWORD = sizeof(DWORD);
+ int nLineBoundary = nBytePerLine % nSizeDWORD;
+ int nPadding = 0;
+
+ if (nLineBoundary > 0)
{
- padding = sizeDWORD - lineBoundary;
- bytePerLine += padding;
+ nPadding = nSizeDWORD - nLineBoundary;
+ nBytePerLine += nPadding;
}
- // calc the number of DIBs and heights of DIBs
- int numDIB = 1;
- int hRemain = 0;
- int height = sizeLimit/bytePerLine;
- if( height >= bmpHeight )
- height = bmpHeight;
+
+ //
+ // Calc the number of DIBs and heights of DIBs
+ //
+ int nNumDIB = 1;
+ int nHRemain = 0;
+ int nHeight = nSizeLimit / nBytePerLine;
+
+ if (nHeight >= nBmpHeight)
+ nHeight = nBmpHeight;
else
{
- numDIB = bmpHeight / height;
- hRemain = bmpHeight % height;
- if( hRemain >0 ) numDIB++;
+ nNumDIB = nBmpHeight / nHeight;
+ nHRemain = nBmpHeight % nHeight;
+ if (nHRemain > 0)
+ nNumDIB++;
}
- // set bitmap parameters
- wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
- bitmap.SetWidth( width );
- bitmap.SetHeight( bmpHeight );
- bitmap.SetDepth( wxDisplayDepth() );
-
- // create a DIB header
- int headersize = sizeof(BITMAPINFOHEADER);
- LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
- wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
+ //
+ // Set bitmap parameters
+ //
+ wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
+ SetWidth(nWidth);
+ SetHeight(nBmpHeight);
+ if (nDepth == 1)
+ m_bIsMono = true;
+ else
+ m_bIsMono = false;
+ if (nDepth == -1)
+ nDepth = wxDisplayDepth();
+ SetDepth(nDepth);
+
+#if wxUSE_PALETTE
+ //
+ // Copy the palette from the source image
+ //
+ SetPalette(rImage.GetPalette());
+#endif // wxUSE_PALETTE
+
+ //
+ // Create a DIB header
+ //
+ BITMAPINFOHEADER2 vHeader;
+ BITMAPINFO2 vInfo;
+
+ //
// Fill in the DIB header
- lpDIBh->bmiHeader.biSize = headersize;
- lpDIBh->bmiHeader.biWidth = (DWORD)width;
- lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
- lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
- // the general formula for biSizeImage:
- // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
- lpDIBh->bmiHeader.biPlanes = 1;
- lpDIBh->bmiHeader.biBitCount = 24;
- lpDIBh->bmiHeader.biCompression = BI_RGB;
- lpDIBh->bmiHeader.biClrUsed = 0;
- // These seem not really needed for our purpose here.
- lpDIBh->bmiHeader.biClrImportant = 0;
- lpDIBh->bmiHeader.biXPelsPerMeter = 0;
- lpDIBh->bmiHeader.biYPelsPerMeter = 0;
- // memory for DIB data
- unsigned char *lpBits;
- lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
- if( !lpBits )
+ //
+ memset(&vHeader, '\0', 16);
+ vHeader.cbFix = 16;
+ vHeader.cx = (ULONG)nWidth;
+ vHeader.cy = (ULONG)nHeight;
+ vHeader.cPlanes = 1L;
+ vHeader.cBitCount = 24;
+
+ //
+ // Memory for DIB data
+ //
+ unsigned char* pucBits;
+
+ pucBits = (unsigned char *)malloc(nBytePerLine * nHeight);
+ if(!pucBits)
{
- wxFAIL_MSG( wxT("could not allocate memory for DIB") );
- free( lpDIBh );
- return bitmap;
+ wxFAIL_MSG(wxT("could not allocate memory for DIB"));
+ return false;
}
+ memset(pucBits, '\0', (nBytePerLine * nHeight));
- // create and set the device-dependent bitmap
- HDC hdc = ::GetDC(NULL);
- HDC memdc = ::CreateCompatibleDC( hdc );
- HBITMAP hbitmap;
- hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
- ::SelectObject( memdc, hbitmap);
-
- // copy image data into DIB data and then into DDB (in a loop)
- unsigned char *data = GetData();
- int i, j, n;
- int origin = 0;
- unsigned char *ptdata = data;
- unsigned char *ptbits;
-
- for( n=0; n<numDIB; n++ )
+ //
+ // Create and set the device-dependent bitmap
+ //
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ SIZEL vSize = {0, 0};
+ HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
+ LONG lScans;
+ HDC hDCScreen = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPSScreen;
+ HBITMAP hBmp;
+ HBITMAP hBmpOld;
+
+ memset(&vInfo, '\0', 16);
+ vInfo.cbFix = 16;
+ vInfo.cx = (ULONG)nWidth;
+ vInfo.cy = (ULONG)nHeight;
+ vInfo.cPlanes = 1;
+ vInfo.cBitCount = 24; // Set to desired count going in
+
+ hBmp = ::GpiCreateBitmap( hPS
+ ,&vHeader
+ ,0L
+ ,NULL
+ ,NULL
+ );
+#if wxUSE_PALETTE
+ HPAL hOldPalette = NULLHANDLE;
+ if (rImage.GetPalette().Ok())
{
- if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
+ hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE());
+ }
+#endif // wxUSE_PALETTE
+
+ //
+ // Copy image data into DIB data and then into DDB (in a loop)
+ //
+ unsigned char* pData = rImage.GetData();
+ int i;
+ int j;
+ int n;
+ int nOrigin = 0;
+ unsigned char* ptdata = pData;
+ unsigned char* ptbits;
+
+ if ((hBmpOld = ::GpiSetBitmap(hPS, hBmp)) == HBM_ERROR)
+ {
+ ERRORID vError;
+ wxString sError;
+
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ }
+ for (n = 0; n < nNumDIB; n++)
+ {
+ if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0)
{
- // redefine height and size of the (possibly) last smaller DIB
+ //
+ // Redefine height and size of the (possibly) last smaller DIB
// memory is not reallocated
- height = hRemain;
- lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
- lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ //
+ nHeight = nHRemain;
+ vHeader.cy = (DWORD)(nHeight);
+ vHeader.cbImage = nBytePerLine * nHeight;
}
- ptbits = lpBits;
-
- for( j=0; j<height; j++ )
+ ptbits = pucBits;
+ for (j = 0; j < nHeight; j++)
{
- for( i=0; i<width; i++ )
+ for (i = 0; i < nWidth; i++)
{
- *(ptbits++) = *(ptdata+2);
- *(ptbits++) = *(ptdata+1);
- *(ptbits++) = *(ptdata );
+ *(ptbits++) = *(ptdata + 2);
+ *(ptbits++) = *(ptdata + 1);
+ *(ptbits++) = *(ptdata);
ptdata += 3;
}
- for( i=0; i< padding; i++ ) *(ptbits++) = 0;
+ for (i = 0; i < nPadding; i++)
+ *(ptbits++) = 0;
}
- ::StretchDIBits( memdc, 0, origin, width, height,\
- 0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
- origin += height;
- // if numDIB = 1, lines below can also be used
- // hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
- // The above line is equivalent to the following two lines.
- // hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
- // ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
- // or the following lines
- // hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
- // HDC memdc = ::CreateCompatibleDC( hdc );
- // ::SelectObject( memdc, hbitmap);
- // ::SetDIBitsToDevice( memdc, 0, 0, width, height,
- // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
- // ::SelectObject( memdc, 0 );
- // ::DeleteDC( memdc );
+
+ //
+ // Have to do something similar to WIN32's StretchDIBits, use GpiBitBlt
+ // in combination with setting the bits into the selected bitmap
+ //
+ if ((lScans = ::GpiSetBitmapBits( hPS
+ ,0 // Start at the bottom
+ ,(LONG)nHeight // One line per scan
+ ,(PBYTE)pucBits
+ ,&vInfo
+ )) == GPI_ALTERROR)
+ {
+ ERRORID vError;
+ wxString sError;
+
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ }
+ hPSScreen = ::GpiCreatePS( vHabmain
+ ,hDCScreen
+ ,&vSize
+ ,PU_PELS | GPIA_ASSOC
+ );
+
+ POINTL vPoint[4] = { {0, nOrigin},
+ {nWidth, nHeight},
+ {0, 0}, {nWidth, nHeight}
+ };
+
+
+ ::GpiBitBlt( hPSScreen
+ ,hPS
+ ,4
+ ,vPoint
+ ,ROP_SRCCOPY
+ ,BBO_IGNORE
+ );
+ ::GpiDestroyPS(hPSScreen);
+ nOrigin += nHeight;
}
- bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
+ SetHBITMAP((WXHBITMAP)hBmp);
+#if wxUSE_PALETTE
+ if (hOldPalette)
+ ::GpiSelectPalette(hPS, hOldPalette);
+#endif // wxUSE_PALETTE
- // similarly, created an mono-bitmap for the possible mask
- if( HasMask() )
+ //
+ // Similarly, created an mono-bitmap for the possible mask
+ //
+ if (rImage.HasMask())
{
- hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
- ::SelectObject( memdc, hbitmap);
- if( numDIB == 1 ) height = bmpHeight;
- else height = sizeLimit/bytePerLine;
- lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
- lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
- origin = 0;
- unsigned char r = GetMaskRed();
- unsigned char g = GetMaskGreen();
- unsigned char b = GetMaskBlue();
- unsigned char zero = 0, one = 255;
- ptdata = data;
- for( n=0; n<numDIB; n++ )
+ vHeader.cbFix = 16;
+ vHeader.cx = nWidth;
+ vHeader.cy = nHeight;
+ vHeader.cPlanes = 1;
+ vHeader.cBitCount = 24;
+ hBmp = ::GpiCreateBitmap( hPS
+ ,&vHeader
+ ,0L
+ ,NULL
+ ,NULL
+ );
+ hBmpOld = ::GpiSetBitmap(hPS, hBmp);
+ if (nNumDIB == 1)
+ nHeight = nBmpHeight;
+ else
+ nHeight = nSizeLimit / nBytePerLine;
+ vHeader.cy = (DWORD)(nHeight);
+ nOrigin = 0;
+
+ unsigned char cRed = rImage.GetMaskRed();
+ unsigned char cGreen = rImage.GetMaskGreen();
+ unsigned char cBlue = rImage.GetMaskBlue();
+ unsigned char cZero = 0;
+ unsigned char cOne = 255;
+
+ ptdata = pData;
+ for (n = 0; n < nNumDIB; n++)
{
- if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
+ if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0)
{
- // redefine height and size of the (possibly) last smaller DIB
+ //
+ // Redefine height and size of the (possibly) last smaller DIB
// memory is not reallocated
- height = hRemain;
- lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
- lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ //
+ nHeight = nHRemain;
+ vHeader.cy = (DWORD)(nHeight);
+ vHeader.cbImage = nBytePerLine * nHeight;
}
- ptbits = lpBits;
- for( int j=0; j<height; j++ )
+ ptbits = pucBits;
+ for (int j = 0; j < nHeight; j++)
{
- for(i=0; i<width; i++ )
+ for (i = 0; i < nWidth; i++)
{
- if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
+ unsigned char cRedImage = (*(ptdata++)) ;
+ unsigned char cGreenImage = (*(ptdata++)) ;
+ unsigned char cBlueImage = (*(ptdata++)) ;
+
+ if ((cRedImage != cRed) || (cGreenImage != cGreen) || (cBlueImage != cBlue))
{
- *(ptbits++) = one;
- *(ptbits++) = one;
- *(ptbits++) = one;
+ *(ptbits++) = cOne;
+ *(ptbits++) = cOne;
+ *(ptbits++) = cOne;
}
else
{
- *(ptbits++) = zero;
- *(ptbits++) = zero;
- *(ptbits++) = zero;
+ *(ptbits++) = cZero;
+ *(ptbits++) = cZero;
+ *(ptbits++) = cZero;
}
}
- for( i=0; i< padding; i++ ) *(ptbits++) = zero;
+ for (i = 0; i < nPadding; i++)
+ *(ptbits++) = cZero;
}
- ::StretchDIBits( memdc, 0, origin, width, height,\
- 0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
- origin += height;
+ lScans = ::GpiSetBitmapBits( hPS
+ ,0 // Start at the bottom
+ ,(LONG)nHeight // One line per scan
+ ,(PBYTE)pucBits
+ ,&vInfo
+ );
+ hPSScreen = ::GpiCreatePS( vHabmain
+ ,hDCScreen
+ ,&vSize
+ ,PU_PELS | GPIA_ASSOC
+ );
+ POINTL vPoint2[4] = { {0, nOrigin},
+ {nWidth, nHeight},
+ {0, 0}, {nWidth, nHeight}
+ };
+ ::GpiBitBlt( hPSScreen
+ ,hPS
+ ,4
+ ,vPoint2
+ ,ROP_SRCCOPY
+ ,BBO_IGNORE
+ );
+ ::GpiDestroyPS(hPSScreen);
+ nOrigin += nHeight;
}
- // create a wxMask object
- wxMask *mask = new wxMask();
- mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
- bitmap.SetMask( mask );
- }
- // free allocated resources
- ::SelectObject( memdc, 0 );
- ::DeleteDC( memdc );
- ::ReleaseDC(NULL, hdc);
- free(lpDIBh);
- free(lpBits);
+ //
+ // Create a wxMask object
+ //
+ wxMask* pMask = new wxMask();
- // check the wxBitmap object
- if( bitmap.GetHBITMAP() )
- bitmap.SetOk( TRUE );
- else
- bitmap.SetOk( FALSE );
-*/
+ pMask->SetMaskBitmap((WXHBITMAP)hBmp);
+ SetMask(pMask);
+ hBmpOld = ::GpiSetBitmap(hPS, hBmpOld);
+ }
- return TRUE;
-}
+ //
+ // Free allocated resources
+ //
+ ::GpiSetBitmap(hPS, NULLHANDLE);
+ ::GpiDestroyPS(hPS);
+ ::DevCloseDC(hDCScreen);
+ ::DevCloseDC(hDC);
+ free(pucBits);
+ return true;
+} // end of wxBitmap::CreateFromImage
wxImage wxBitmap::ConvertToImage() const
{
- wxImage image;
+ wxImage vImage;
+ wxDC* pDC;
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
- // create an wxImage object
- int width = GetWidth();
- int height = GetHeight();
- image.Create( width, height );
- unsigned char *data = image.GetData();
- if( !data )
+ //
+ // Create an wxImage object
+ //
+ int nWidth = GetWidth();
+ int nHeight = GetHeight();
+ int nDevWidth;
+ int nDevHeight;
+ int nBytePerLine = nWidth * 3;
+ int nSizeDWORD = sizeof(DWORD);
+ int nLineBoundary = nBytePerLine % nSizeDWORD;
+ int nPadding = 0;
+ unsigned char* pData;
+ unsigned char* lpBits;
+ long lScans;
+ BITMAPINFOHEADER2 vDIBh;
+ BITMAPINFO2 vDIBInfo;
+ HPS hPSMem;
+ HBITMAP hBitmap;
+ HBITMAP hOldBitmap;
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ SIZEL vSizlPage = {0,0};
+ HDC hDCMem = NULLHANDLE;
+
+ vImage.Create( nWidth
+ ,nHeight
+ );
+ pData = vImage.GetData();
+ if(!pData)
{
wxFAIL_MSG( wxT("could not allocate data for image") );
return wxNullImage;
}
+ if(nLineBoundary > 0)
+ {
+ nPadding = nSizeDWORD - nLineBoundary;
+ nBytePerLine += nPadding;
+ }
+ wxDisplaySize( &nDevWidth
+ ,&nDevHeight
+ );
+ //
+ // Create and fill a DIB header
+ //
+ memset(&vDIBh, '\0', 16);
+ vDIBh.cbFix = 16;
+ vDIBh.cx = nWidth;
+ vDIBh.cy = nHeight;
+ vDIBh.cPlanes = 1;
+ vDIBh.cBitCount = 24;
+
+ memset(&vDIBInfo, '\0', 16);
+ vDIBInfo.cbFix = 16;
+ vDIBInfo.cx = nWidth;
+ vDIBInfo.cy = nHeight;
+ vDIBInfo.cPlanes = 1;
+ vDIBInfo.cBitCount = 24;
+
+ lpBits = (unsigned char *)malloc(nBytePerLine * nHeight);
+ if (!lpBits)
+ {
+ wxFAIL_MSG(wxT("could not allocate data for DIB"));
+ free(pData);
+ return wxNullImage;
+ }
+ memset(lpBits, '\0', (nBytePerLine * nHeight));
+ hBitmap = (HBITMAP)GetHBITMAP();
- // calc the number of bytes per scanline and padding in the DIB
- int bytePerLine = width*3;
- int sizeDWORD = sizeof( DWORD );
- int lineBoundary = bytePerLine % sizeDWORD;
- int padding = 0;
- if( lineBoundary > 0 )
+ //
+ // May already be selected into a PS
+ //
+ if ((pDC = GetSelectedInto()) != NULL)
{
- padding = sizeDWORD - lineBoundary;
- bytePerLine += padding;
+ hPSMem = pDC->GetHPS();
}
-// TODO:
-/*
- // create a DIB header
- int headersize = sizeof(BITMAPINFOHEADER);
- LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
- if( !lpDIBh )
+ else
{
- wxFAIL_MSG( wxT("could not allocate data for DIB header") );
- free( data );
- return;
+ hDCMem = ::DevOpenDC( vHabmain
+ ,OD_MEMORY
+ ,"*"
+ ,5L
+ ,(PDEVOPENDATA)&vDop
+ ,NULLHANDLE
+ );
+ hPSMem = ::GpiCreatePS( vHabmain
+ ,hDCMem
+ ,&vSizlPage
+ ,PU_PELS | GPIA_ASSOC
+ );
}
- // Fill in the DIB header
- lpDIBh->bmiHeader.biSize = headersize;
- lpDIBh->bmiHeader.biWidth = width;
- lpDIBh->bmiHeader.biHeight = -height;
- lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
- lpDIBh->bmiHeader.biPlanes = 1;
- lpDIBh->bmiHeader.biBitCount = 24;
- lpDIBh->bmiHeader.biCompression = BI_RGB;
- lpDIBh->bmiHeader.biClrUsed = 0;
- // These seem not really needed for our purpose here.
- lpDIBh->bmiHeader.biClrImportant = 0;
- lpDIBh->bmiHeader.biXPelsPerMeter = 0;
- lpDIBh->bmiHeader.biYPelsPerMeter = 0;
- // memory for DIB data
- unsigned char *lpBits;
- lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
- if( !lpBits )
+ if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR)
+ {
+ ERRORID vError;
+ wxString sError;
+
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ }
+
+ //
+ // Copy data from the device-dependent bitmap to the DIB
+ //
+ if ((lScans = ::GpiQueryBitmapBits( hPSMem
+ ,0L
+ ,(LONG)nHeight
+ ,(PBYTE)lpBits
+ ,&vDIBInfo
+ )) == GPI_ALTERROR)
{
- wxFAIL_MSG( wxT("could not allocate data for DIB") );
- free( data );
- free( lpDIBh );
- return;
+ ERRORID vError;
+ wxString sError;
+
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
}
- // copy data from the device-dependent bitmap to the DIB
- HDC hdc = ::GetDC(NULL);
- HBITMAP hbitmap;
- hbitmap = (HBITMAP) bitmap.GetHBITMAP();
- ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-
- // copy DIB data into the wxImage object
- int i, j;
- unsigned char *ptdata = data;
- unsigned char *ptbits = lpBits;
- for( i=0; i<height; i++ )
+ //
+ // Copy DIB data into the wxImage object
+ //
+ int i;
+ int j;
+ unsigned char* ptdata = pData;
+ unsigned char* ptbits = lpBits;
+
+ for (i = 0; i < nHeight; i++)
{
- for( j=0; j<width; j++ )
+ for (j = 0; j < nWidth; j++)
{
*(ptdata++) = *(ptbits+2);
*(ptdata++) = *(ptbits+1);
*(ptdata++) = *(ptbits );
ptbits += 3;
}
- ptbits += padding;
+ ptbits += nPadding;
+ }
+ if ((pDC = GetSelectedInto()) == NULL)
+ {
+ ::GpiSetBitmap(hPSMem, NULLHANDLE);
+ ::GpiDestroyPS(hPSMem);
+ ::DevCloseDC(hDCMem);
}
- // similarly, set data according to the possible mask bitmap
- if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
+ //
+ // Similarly, set data according to the possible mask bitmap
+ //
+ if (GetMask() && GetMask()->GetMaskBitmap())
{
- hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
- // memory DC created, color set, data copied, and memory DC deleted
- HDC memdc = ::CreateCompatibleDC( hdc );
- ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
- ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
- ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
- ::DeleteDC( memdc );
- // background color set to RGB(16,16,16) in consistent with wxGTK
- unsigned char r=16, g=16, b=16;
- ptdata = data;
+ hBitmap = (HBITMAP)GetMask()->GetMaskBitmap();
+
+ //
+ // Memory DC/PS created, color set, data copied, and memory DC/PS deleted
+ //
+ HDC hMemDC = ::DevOpenDC( vHabmain
+ ,OD_MEMORY
+ ,"*"
+ ,5L
+ ,(PDEVOPENDATA)&vDop
+ ,NULLHANDLE
+ );
+ HPS hMemPS = ::GpiCreatePS( vHabmain
+ ,hMemDC
+ ,&vSizlPage
+ ,PU_PELS | GPIA_ASSOC
+ );
+ ::GpiSetColor(hMemPS, OS2RGB(0, 0, 0));
+ ::GpiSetBackColor(hMemPS, OS2RGB(255, 255, 255) );
+ ::GpiSetBitmap(hMemPS, hBitmap);
+ ::GpiQueryBitmapBits( hPSMem
+ ,0L
+ ,(LONG)nHeight
+ ,(PBYTE)lpBits
+ ,&vDIBInfo
+ );
+ ::GpiSetBitmap(hMemPS, NULLHANDLE);
+ ::GpiDestroyPS(hMemPS);
+ ::DevCloseDC(hMemDC);
+
+ //
+ // Background color set to RGB(16,16,16) in consistent with wxGTK
+ //
+ unsigned char ucRed = 16;
+ unsigned char ucGreen = 16;
+ unsigned char ucBlue = 16;
+
+ ptdata = pData;
ptbits = lpBits;
- for( i=0; i<height; i++ )
+ for (i = 0; i < nHeight; i++)
{
- for( j=0; j<width; j++ )
+ for (j = 0; j < nWidth; j++)
{
- if( *ptbits != 0 )
+ if (*ptbits != 0)
ptdata += 3;
else
{
- *(ptdata++) = r;
- *(ptdata++) = g;
- *(ptdata++) = b;
+ *(ptdata++) = ucRed;
+ *(ptdata++) = ucGreen;
+ *(ptdata++) = ucBlue;
}
ptbits += 3;
}
- ptbits += padding;
+ ptbits += nPadding;
}
- SetMaskColour( r, g, b );
- SetMask( TRUE );
+ vImage.SetMaskColour( ucRed
+ ,ucGreen
+ ,ucBlue
+ );
+ vImage.SetMask(true);
}
else
{
- SetMask( FALSE );
+ vImage.SetMask(false);
}
- // free allocated resources
- ::ReleaseDC(NULL, hdc);
- free(lpDIBh);
- free(lpBits);
-*/
-
- return image;
-}
+ //
+ // Free allocated resources
+ //
+ free(lpBits);
+ return vImage;
+} // end of wxBitmap::ConvertToImage
// ----------------------------------------------------------------------------
// sub bitmap extraction
HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
- POINTL vPoint[4] = { rRect.x, rRect.y,
- rRect.x + rRect.width, rRect.y + rRect.height,
- 0, 0, GetWidth(), GetHeight()
+ POINTL vPoint[4] = { {0, 0}, {rRect.width, rRect.height},
+ {rRect.x, rRect.y},
+ {rRect.x + rRect.width, rRect.y + rRect.height}
};
::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());
vBmih.cx = rRect.width;
vBmih.cy = rRect.height;
vBmih.cPlanes = 1;
- vBmih.cBitCount = 1;
+ vBmih.cBitCount = 24;
HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst
,&vBmih
GetBitmapData()->m_nQuality = nQ;
} // end of wxBitmap::SetQuality
-#if WXWIN_COMPATIBILITY_2
-void wxBitmap::SetOk(
- bool bOk
-)
-{
- EnsureHasData();
-
- GetBitmapData()->m_bOk = bOk;
-} // end of wxBitmap::SetOk
-#endif // WXWIN_COMPATIBILITY_2
-
void wxBitmap::SetPalette(
const wxPalette& rPalette
)
GetBitmapData()->m_pBitmapMask = pMask;
} // end of wxBitmap::SetMask
-//
-// Will try something for OS/2 but not really sure how close
-// to the msw intent this is.
-//
-wxBitmap wxBitmap::GetBitmapForDC(
- wxDC& rDc
-) const
+wxBitmap wxBitmap::GetBitmapForDC(wxDC& WXUNUSED(rDc)) const
{
- wxMemoryDC vMemDC;
- wxBitmap vTmpBitmap( this->GetWidth()
- ,this->GetHeight()
- ,rDc.GetDepth()
- );
- WXHBITMAP vOldBitmap;
- HPS hMemoryPS;
- HPS hPs;
- POINTL vPoint[4];
- SIZEL vSize = {0,0};
-
- hMemoryPS = ::GpiCreatePS(vHabmain, (HDC)vMemDC.GetHDC(), &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
- hPs = ::GpiCreatePS(vHabmain, (HDC)rDc.GetHDC(), &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
-
- // TODO: Set the points
-
- vOldBitmap = (WXHBITMAP)::GpiSetBitmap(hPs, (HBITMAP)vTmpBitmap.GetHBITMAP());
- ::GpiBitBlt(hPs, hMemoryPS, 4L, vPoint, ROP_SRCCOPY, BBO_IGNORE);
-
- return(vTmpBitmap);
+ return(*this);
} // end of wxBitmap::GetBitmapForDC
// ----------------------------------------------------------------------------
HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
- POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(),
- 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
+ POINTL vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()},
+ {0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}
};
if (m_hMaskBitmap)
}
if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
{
- return(FALSE);
+ return false;
}
memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
vBmih.cx = rBitmap.GetWidth();
vBmih.cy = rBitmap.GetHeight();
vBmih.cPlanes = 1;
- vBmih.cBitCount = 1;
+ vBmih.cBitCount = 24;
m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
,&vBmih
::GpiDestroyPS(hPSDst);
::DevCloseDC(hDCSrc);
::DevCloseDC(hDCDst);
- return(TRUE);
+ return true;
} // end of wxMask::Create
// Create a mask from a bitmap and a palette index indicating
));
}
}
- return(FALSE);
+ return false;
} // end of wxMask::Create
// Create a mask from a bitmap and a colour indicating
, const wxColour& rColour
)
{
- bool bOk = TRUE;
+ bool bOk = true;
COLORREF vMaskColour = OS2RGB( rColour.Red()
,rColour.Green()
,rColour.Blue()
HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
- POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(),
- 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
- };
if (m_hMaskBitmap)
{
}
if (!rBitmap.Ok())
{
- return(FALSE);
+ return false;
}
//
//
// Doesn't make sense to continue
//
- bOk = FALSE;
+ bOk = false;
break;
}
::GpiDestroyPS(hPSDst);
::DevCloseDC(hDCSrc);
::DevCloseDC(hDCDst);
- return(TRUE);
+ return true;
} // end of wxMask::Create
// ----------------------------------------------------------------------------
// wxBitmapHandler
// ----------------------------------------------------------------------------
-bool wxBitmapHandler::Create(
- wxGDIImage* pImage
-, void* pData
-, long lFlags
-, int nWidth
-, int nHeight
-, int nDepth
-)
+bool wxBitmapHandler::Create( wxGDIImage* pImage,
+ void* pData,
+ long WXUNUSED(lFlags),
+ int nWidth,
+ int nHeight,
+ int nDepth)
{
- wxBitmap* pBitmap = wxDynamicCast( pImage
- ,wxBitmap
- );
+ wxBitmap* pBitmap = wxDynamicCast( pImage
+ ,wxBitmap
+ );
return(pBitmap ? Create( pBitmap
,pData
,nWidth
,nHeight
,nDepth
- ) : FALSE);
+ ) : false);
}
bool wxBitmapHandler::Load(
wxGDIImage* pImage
-, const wxString& rName
-, HPS hPs
+, int nId
, long lFlags
, int nWidth
, int nHeight
);
return(pBitmap ? LoadFile( pBitmap
- ,rName
- ,hPs
+ ,nId
,lFlags
,nWidth
,nHeight
- ) : FALSE);
+ ) : false);
}
bool wxBitmapHandler::Save(
return(pBitmap ? SaveFile( pBitmap
,rName
,lType
- ) : FALSE);
+ ) : false);
}
bool wxBitmapHandler::Create(
, int WXUNUSED(nDepth)
)
{
- return(FALSE);
+ return false;
}
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
-, const wxString& WXUNUSED(rName)
-, HPS WXUNUSED(hPs)
+, int WXUNUSED(nId)
, long WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)
)
{
- return(FALSE);
+ return false;
}
bool wxBitmapHandler::SaveFile(
, const wxPalette* WXUNUSED(pPalette)
)
{
- return(FALSE);
+ return false;
}
// ----------------------------------------------------------------------------
HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
- POINTL vPoint[4] = { 0 ,0, nWidth, nHeight,
- 0, 0, nWidth, nHeight
+ POINTL vPoint[4] = { {0 ,0}, {nWidth, nHeight},
+ {0, 0}, {nWidth, nHeight}
};
- memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
- vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
+ memset(&vBmih, '\0', 16);
+ vBmih.cbFix = 16;
vBmih.cx = nWidth;
vBmih.cy = nHeight;
vBmih.cPlanes = 1;
- vBmih.cBitCount = 1;
+ vBmih.cBitCount = 24;
hBmpInvMask = ::GpiCreateBitmap( hPSDst
,&vBmih
projects / wxWidgets.git / blobdiff