X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..8f974c520a8733158591891458fda10fae4c3950:/src/os2/icon.cpp?ds=sidebyside

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index d4ef849d8f..4801c71d86 100644
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -68,7 +68,15 @@ wxIcon::wxIcon(
 , int                               nDesiredHeight
 )
 {
-    LoadFile( rIconFile
+    //
+    // 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 += "Os2.ico";
+    LoadFile( sOs2Name
              ,lFlags
              ,nDesiredWidth
              ,nDesiredHeight
@@ -79,6 +87,89 @@ wxIcon::~wxIcon()
 {
 }
 
+void wxIcon::CreateIconFromXpm(
+  const char**                      ppData
+)
+{
+    wxBitmap                        vBmp(ppData);
+
+    CopyFromBitmap(vBmp);
+} // end of wxIcon::CreateIconFromXpm
+
+void wxIcon::CopyFromBitmap(
+  const wxBitmap&                   rBmp
+)
+{
+    wxMask*                         pMask = rBmp.GetMask();
+
+    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
+                          );
+    }
+
+    POINTERINFO                        vIconInfo;
+
+    memset(&vIconInfo, '\0', sizeof(POINTERINFO));
+    vIconInfo.fPointer = FALSE;  // we want an icon, not a pointer
+    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()
+                                                };
+    ::GpiSetBitmap(hPSSrc, (HBITMAP) pMask->GetMaskBitmap());
+    ::GpiSetBitmap(hPSDst, (HBITMAP) vIconInfo.hbmColor);
+    ::GpiBitBlt( hPSDst
+                ,hPSSrc
+                ,4L
+                ,vPoint
+                ,ROP_SRCAND
+                ,BBO_IGNORE
+               );
+
+    ::GpiSetBitmap(hPSSrc, NULL);
+    ::GpiSetBitmap(hPSDst, NULL);
+    ::GpiDestroyPS(hPSSrc);
+    ::GpiDestroyPS(hPSDst);
+    ::DevCloseDC(hDCSrc);
+    ::DevCloseDC(hDCDst);
+
+    HICON                           hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP
+                                                                       ,&vIconInfo
+                                                                      );
+
+    if (!hIcon)
+    {
+        wxLogLastError(wxT("WinCreatePointerIndirect"));
+    }
+    else
+    {
+        SetHICON((WXHICON)hIcon);
+        SetSize( rBmp.GetWidth()
+                ,rBmp.GetHeight()
+               );
+    }
+
+    if (!rBmp.GetMask())
+    {
+        //
+        // We created the mask, now delete it
+        //
+        delete pMask;
+    }
+} // end of wxIcon::CopyFromBitmap
+
 bool wxIcon::LoadFile(
   const wxString&                   rFilename
 , long                              lType
@@ -86,14 +177,16 @@ 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
                               ,rFilename
+                              ,hPs
                               ,lType
                               ,nDesiredWidth
                               ,nDesiredHeight