X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52315bc3bb8b2afcca85c3c910e1bfd9b33f19f9..4f0eda0e6ee3c289a932ef5fd224ea1d67bb086a:/src/os2/icon.cpp?ds=sidebyside diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index d1c390da8f..7f2746b4a2 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.cpp +// Name: src/os2/icon.cpp // Purpose: wxIcon class // Author: David Webster // Modified by: @@ -13,23 +13,22 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#include "wx/icon.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/icon.h" + #include "wx/log.h" #endif #include "wx/os2/private.h" #include "assert.h" -#include "wx/icon.h" - - IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) // ============================================================================ // implementation @@ -50,32 +49,31 @@ void wxIconRefData::Free() // ---------------------------------------------------------------------------- wxIcon::wxIcon() + :m_bIsXpm(false) { } -wxIcon::wxIcon( - const char WXUNUSED(bits)[] -, int WXUNUSED(nWidth) -, int WXUNUSED(nHeight) -) +wxIcon::wxIcon( const char WXUNUSED(bits)[], + int WXUNUSED(nWidth), + int WXUNUSED(nHeight) ) + :m_bIsXpm(false) { } -wxIcon::wxIcon( - const wxString& rIconFile -, long lFlags -, int nDesiredWidth -, int nDesiredHeight -) +wxIcon::wxIcon( const wxString& rIconFile, + long lFlags, + int nDesiredWidth, + int nDesiredHeight ) + :m_bIsXpm(false) { // // A very poor hack, but we have to have separate icon files from windows // So we have a modified name where replace the last three characters // with os2. Also need the extension. // - wxString sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3); + wxString sOs2Name = rIconFile.Mid(0, rIconFile.length() - 3); - sOs2Name += "Os2.ico"; + sOs2Name += wxT("Os2.ico"); LoadFile( sOs2Name ,lFlags ,nDesiredWidth @@ -94,13 +92,18 @@ void wxIcon::CreateIconFromXpm( wxBitmap vBmp(ppData); CopyFromBitmap(vBmp); + if (GetHICON()) + { + m_bIsXpm = true; + m_vXpmSrc = vBmp; + } } // end of wxIcon::CreateIconFromXpm -void wxIcon::CopyFromBitmap( - const wxBitmap& rBmp -) +void wxIcon::CopyFromBitmap( const wxBitmap& rBmp ) { wxMask* pMask = rBmp.GetMask(); + HBITMAP hBmp = NULLHANDLE; + HBITMAP hBmpMask = NULLHANDLE; HBITMAP hOldBitmap = NULLHANDLE; ERRORID vError; wxString sError; @@ -117,38 +120,94 @@ void wxIcon::CopyFromBitmap( ); } - POINTERINFO vIconInfo; + BITMAPINFOHEADER2 vHeader; + SIZEL vSize = {0, 0}; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + 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}, {rBmp.GetWidth(), rBmp.GetHeight()}, + {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} + }; + POINTL vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2}, + {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} + }; + POINTERINFO vIconInfo; memset(&vIconInfo, '\0', sizeof(POINTERINFO)); vIconInfo.fPointer = FALSE; // we want an icon, not a pointer - vIconInfo.hbmPointer = (HBITMAP) pMask->GetMaskBitmap(); - vIconInfo.hbmColor = GetHbitmapOf(rBmp); - - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - 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, rBmp.GetWidth(), rBmp.GetHeight(), - 0, 0, rBmp.GetWidth(), rBmp.GetHeight() - }; - if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, (HBITMAP) pMask->GetMaskBitmap())) == HBM_ERROR) + + memset(&vHeader, '\0', 16); + vHeader.cbFix = 16; + vHeader.cx = (ULONG)rBmp.GetWidth(); + vHeader.cy = (ULONG)rBmp.GetHeight(); + vHeader.cPlanes = 1L; + vHeader.cBitCount = 24; + + hBmp = ::GpiCreateBitmap( hPSDst + ,&vHeader + ,0L + ,NULL + ,NULL + ); + + if ((hOldBitmap = ::GpiSetBitmap(hPSDst, hBmp)) == HBM_ERROR) { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); } - if ((hOldBitmap = ::GpiSetBitmap(hPSDst, (HBITMAP) vIconInfo.hbmColor)) == HBM_ERROR) + if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, (HBITMAP)rBmp.GetHBITMAP())) == HBM_ERROR) { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); } - ::GpiSetBitmapId(hPSDst, (HBITMAP) vIconInfo.hbmColor, 1L); if ((lHits = ::GpiBitBlt( hPSDst ,hPSSrc ,4L ,vPoint - ,ROP_SRCAND + ,ROP_SRCCOPY + ,BBO_IGNORE + )) == GPI_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSDst, NULLHANDLE)) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, NULLHANDLE)) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + vIconInfo.hbmColor = hBmp; + + vHeader.cy = (ULONG)rBmp.GetHeight() * 2; + hBmpMask = ::GpiCreateBitmap( hPSDst + ,&vHeader + ,0L + ,NULL + ,NULL + ); + + if ((hOldBitmap = ::GpiSetBitmap(hPSDst, hBmpMask)) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, (HBITMAP)pMask->GetMaskBitmap())) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((lHits = ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPointMask + ,ROP_SRCCOPY ,BBO_IGNORE )) == GPI_ERROR) { @@ -166,16 +225,9 @@ void wxIcon::CopyFromBitmap( sError = wxPMErrorToStr(vError); } - ::GpiSetBitmap(hPSSrc, NULL); - ::GpiSetBitmap(hPSDst, NULL); - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); + vIconInfo.hbmPointer = hBmpMask; - HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP - ,&vIconInfo - ); + HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP, &vIconInfo); if (!hIcon) { @@ -198,14 +250,18 @@ void wxIcon::CopyFromBitmap( // delete pMask; } + ::GpiSetBitmap(hPSSrc, NULL); + ::GpiSetBitmap(hPSDst, NULL); + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); } // end of wxIcon::CopyFromBitmap -bool wxIcon::LoadFile( - const wxString& rFilename -, long lType -, int nDesiredWidth -, int nDesiredHeight -) +bool wxIcon::LoadFile( const wxString& rFilename, + long lType, + int nDesiredWidth, + int nDesiredHeight ) { HPS hPs = NULLHANDLE; @@ -222,6 +278,5 @@ bool wxIcon::LoadFile( ,nDesiredHeight )); else - return(FALSE); + return false; } -