X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb9010ed40454cc978a9cbaa6de2ee41ea8b6c84..2e14066008229145e2da7b9f05a478ce38631f83:/src/os2/icon.cpp diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index 60614db09c..bfef80f19c 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,138 +13,268 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" #include "wx/icon.h" + +#ifndef WX_PRECOMP + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/log.h" #endif #include "wx/os2/private.h" #include "assert.h" -#include "wx/icon.h" +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler) -IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler) -#endif +// ============================================================================ +// implementation +// ============================================================================ -/* - * Icons - */ +// ---------------------------------------------------------------------------- +// wxIconRefData +// ---------------------------------------------------------------------------- -wxIconRefData::wxIconRefData() +void wxIconRefData::Free() { - m_hIcon = (WXHICON) NULL ; + if (m_hIcon) + ::WinFreeFileIcon((HPOINTER)m_hIcon); } -wxIconRefData::~wxIconRefData() -{ - if ( m_hIcon ) - return; - // TODO ::DestroyIcon((HICON) m_hIcon); -} +// ---------------------------------------------------------------------------- +// wxIcon +// ---------------------------------------------------------------------------- wxIcon::wxIcon() + :m_bIsXpm(false) { } -wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height)) +wxIcon::wxIcon( const char WXUNUSED(bits)[], + int WXUNUSED(nWidth), + int WXUNUSED(nHeight) ) + :m_bIsXpm(false) { } -wxIcon::wxIcon(const wxString& icon_file, long flags, - int desiredWidth, int desiredHeight) - +wxIcon::wxIcon( const wxString& rIconFile, + wxBitmapType lFlags, + int nDesiredWidth, + int nDesiredHeight ) + :m_bIsXpm(false) { - LoadFile(icon_file, flags, desiredWidth, desiredHeight); + // + // 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); + + sOs2Name += wxT("Os2.ico"); + LoadFile( sOs2Name + ,lFlags + ,nDesiredWidth + ,nDesiredHeight + ); } wxIcon::~wxIcon() { } -bool wxIcon::LoadFile(const wxString& filename, long type, - int desiredWidth, int desiredHeight) +void wxIcon::CreateIconFromXpm(const char* const* ppData) { - UnRef(); + wxBitmap vBmp(ppData); - m_refData = new wxIconRefData; + CopyFromBitmap(vBmp); + if (GetHICON()) + { + m_bIsXpm = true; + m_vXpmSrc = vBmp; + } +} // end of wxIcon::CreateIconFromXpm - wxBitmapHandler *handler = FindHandler(type); +void wxIcon::CopyFromBitmap( const wxBitmap& rBmp ) +{ + wxMask* pMask = rBmp.GetMask(); + HBITMAP hBmp = NULLHANDLE; + HBITMAP hBmpMask = NULLHANDLE; + HBITMAP hOldBitmap = NULLHANDLE; + ERRORID vError; + wxString sError; + LONG lHits; - if ( handler ) - return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); - else - return FALSE; -} + if (!pMask) + { + // + // We must have a mask for an icon, so even if it's probably incorrect, + // do create it (grey is the "standard" transparent colour) + // + pMask = new wxMask( rBmp + ,*wxLIGHT_GREY + ); + } -void wxIcon::SetHICON(WXHICON ico) -{ - if ( !M_ICONDATA ) - m_refData = new wxIconRefData; + 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; - M_ICONDATA->m_hIcon = ico; -} + memset(&vIconInfo, '\0', sizeof(POINTERINFO)); + vIconInfo.fPointer = FALSE; // we want an icon, not a pointer -bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ - return FALSE; -} + memset(&vHeader, '\0', 16); + vHeader.cbFix = 16; + vHeader.cx = (ULONG)rBmp.GetWidth(); + vHeader.cy = (ULONG)rBmp.GetHeight(); + vHeader.cPlanes = 1L; + vHeader.cBitCount = 24; -bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ -// TODO -/* - if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) ) - { - if (desiredWidth > -1 && desiredHeight > -1) + hBmp = ::GpiCreateBitmap( hPSDst + ,&vHeader + ,0L + ,NULL + ,NULL + ); + + if ((hOldBitmap = ::GpiSetBitmap(hPSDst, hBmp)) == HBM_ERROR) { - M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR); + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); } - else + if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, (HBITMAP)rBmp.GetHBITMAP())) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((lHits = ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + )) == GPI_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSDst, NULLHANDLE)) == HBM_ERROR) { - M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadIcon(wxGetInstance(), name); + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); } + if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, NULLHANDLE)) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + vIconInfo.hbmColor = hBmp; - ICONINFO info ; - if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info)) + 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) { - HBITMAP ms_bitmap = info.hbmMask ; - if (ms_bitmap) - { - BITMAP bm; - ::GetObject(ms_bitmap, sizeof(BITMAP), (LPSTR) &bm); - M_ICONHANDLERDATA->m_width = bm.bmWidth; - M_ICONHANDLERDATA->m_height = bm.bmHeight; - } - if (info.hbmMask) - ::DeleteObject(info.hbmMask) ; - if (info.hbmColor) - ::DeleteObject(info.hbmColor) ; - } + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); } - // Override the found values with desired values - if (desiredWidth > -1 && desiredHeight > -1) + if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, NULLHANDLE)) == HBM_ERROR) { - M_ICONHANDLERDATA->m_width = desiredWidth; - M_ICONHANDLERDATA->m_height = desiredHeight; + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSDst, NULLHANDLE)) == HBM_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); } - M_ICONHANDLERDATA->m_ok = (M_ICONHANDLERDATA->m_hIcon != 0); - return M_ICONHANDLERDATA->m_ok; - } - else -*/ - return FALSE; -} + vIconInfo.hbmPointer = hBmpMask; + + HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP, &vIconInfo); + + if (!hIcon) + { + wxLogLastError(wxT("WinCreatePointerIndirect")); + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + else + { + SetHICON((WXHICON)hIcon); + SetSize( rBmp.GetWidth() + ,rBmp.GetHeight() + ); + } + + if (!rBmp.GetMask()) + { + // + // We created the mask, now delete it + // + 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, + wxBitmapType lType, + int nDesiredWidth, + int nDesiredHeight ) +{ + HPS hPs = NULLHANDLE; + + UnRef(); + + wxGDIImageHandler* pHandler = FindHandler(lType); + + if (pHandler) + return(pHandler->Load( this + ,rFilename + ,hPs + ,lType + ,nDesiredWidth + ,nDesiredHeight + )); + else + return false; +}