added functions to read/write several elements at once (patch 754986)

[wxWidgets.git] / src / os2 / icon.cpp

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index 9168126aeeaa8f19fc42903e90c7e8c359c02450..a916c7c979f47c3deedd02d67a0a8844ddffd14b 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -22,6 +22,7 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -29,7 +30,7 @@
 
 #include "wx/icon.h"
 
-    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
+    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
 
 // ============================================================================
 // implementation
@@ -50,6 +51,7 @@ void wxIconRefData::Free()
 // ----------------------------------------------------------------------------
 
 wxIcon::wxIcon()
+: m_bIsXpm(FALSE)
 {
 }
 
@@ -58,6 +60,7 @@ wxIcon::wxIcon(
 , int                               WXUNUSED(nWidth)
 , int                               WXUNUSED(nHeight)
 )
+: m_bIsXpm(FALSE)
 {
 }
 
@@ -67,6 +70,7 @@ wxIcon::wxIcon(
 , int                               nDesiredWidth
 , int                               nDesiredHeight
 )
+: m_bIsXpm(FALSE)
 {
     //
     // A very poor hack, but we have to have separate icon files from windows
@@ -87,6 +91,184 @@ wxIcon::~wxIcon()
 {
 }
 
+void wxIcon::CreateIconFromXpm(
+  const char**                      ppData
+)
+{
+    wxBitmap                        vBmp(ppData);
+
+    CopyFromBitmap(vBmp);
+    if (GetHICON())
+    {
+        m_bIsXpm = TRUE;
+        m_vXpmSrc = vBmp;
+    }
+} // end of wxIcon::CreateIconFromXpm
+
+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 (!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
+                          );
+    }
+
+    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
+
+    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(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)
+    {
+        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)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+    }
+    if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, NULLHANDLE)) == HBM_ERROR)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+    }
+    if ((hOldBitmap = ::GpiSetBitmap(hPSDst, NULLHANDLE)) == HBM_ERROR)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+    }
+
+    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
 , long                              lType
@@ -94,11 +276,11 @@ bool wxIcon::LoadFile(
 , int                               nDesiredHeight
 )
 {
-    wxGDIImageHandler*              pHandler = FindHandler(lType);
     HPS                             hPs = NULLHANDLE;
 
     UnRef();
-    m_refData = new wxIconRefData;
+
+    wxGDIImageHandler*              pHandler = FindHandler(lType);
 
     if (pHandler)
         return(pHandler->Load( this