]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/bitmap.cpp
cleaned up the checkbox creation code (~70 lines of code became 3)
[wxWidgets.git] / src / os2 / bitmap.cpp
index 2bf5a7dc483d20c7f144970bf554b8319fae095d..1ca4781c1d2a54a25af34da727883dd9b0ba0132 100644 (file)
@@ -33,6 +33,7 @@
 
 //#include "wx/msw/dib.h"
 #include "wx/image.h"
 
 //#include "wx/msw/dib.h"
 #include "wx/image.h"
+#include "wx/xpmdecod.h"
 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros
@@ -67,7 +68,7 @@ void wxBitmapRefData::Free()
 
     if (m_hBitmap)
     {
 
     if (m_hBitmap)
     {
-        if ( !::GpiDeleteBitmap((HBITMAP)m_hBitmap) )
+        if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap))
         {
             wxLogLastError("GpiDeleteBitmap(hbitmap)");
         }
         {
             wxLogLastError("GpiDeleteBitmap(hbitmap)");
         }
@@ -84,10 +85,6 @@ void wxBitmapRefData::Free()
 // this function should be called from all wxBitmap ctors
 void wxBitmap::Init()
 {
 // 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);
 } // end of wxBitmap::Init
 
 bool wxBitmap::CopyFromIconOrCursor(
 } // end of wxBitmap::Init
 
 bool wxBitmap::CopyFromIconOrCursor(
@@ -146,15 +143,13 @@ bool wxBitmap::CopyFromIcon(
 
 wxBitmap::~wxBitmap()
 {
 
 wxBitmap::~wxBitmap()
 {
-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);
 } // end of wxBitmap::~wxBitmap
 
 wxBitmap::wxBitmap(
   const char                        zBits[]
 } // end of wxBitmap::~wxBitmap
 
 wxBitmap::wxBitmap(
   const char                        zBits[]
-, int                               nTheWidth
-, int                               nTheHeight
-, int                               nNoBits
+, int                               nWidth
+, int                               nHeight
+, int                               nDepth
 )
 {
     Init();
 )
 {
     Init();
@@ -166,82 +161,107 @@ wxBitmap::wxBitmap(
     HPS                             hPs;
     DEVOPENSTRUC                    vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
     SIZEL                           vSize = {0, 0};
     HPS                             hPs;
     DEVOPENSTRUC                    vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
     SIZEL                           vSize = {0, 0};
+    char*                           pzData;
 
     wxASSERT(vHabmain != NULL);
 
 
     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, (PSZ)"*", 1L, (PDEVOPENDATA)&vDop, 0L);
     hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS);
     if (hPs == 0)
     {
         wxLogLastError("GpiCreatePS Failure");
     }
 
     hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS);
     if (hPs == 0)
     {
         wxLogLastError("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 inversed!
+        //
+        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;
+
+                for (nBits = 0; nBits < 8; nBits++)
+                {
+                    ucReversed <<= 1;
+                    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
+    }
 
 
-    pRefData->m_nWidth = nTheWidth;
-    pRefData->m_nHeight = nTheHeight;
-    pRefData->m_nDepth = nNoBits;
-    pRefData->m_nNumColors = 0;
-    pRefData->m_pSelectedInto = NULL;
+    memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
+    vHeader.cbFix           = sizeof(vHeader);
+    vHeader.cx              = (USHORT)nWidth;
+    vHeader.cy              = (USHORT)nHeight;
+    vHeader.cPlanes         = 1L;
+    vHeader.cBitCount       = nDepth;
+    vHeader.usReserved      = 0;
+    vHeader.ulCompression   = BCA_UNCOMP;
+    vHeader.usRecording     = BRA_BOTTOMUP;
+    vHeader.usRendering     = BRH_NOTHALFTONED;
+    vHeader.ulColorEncoding = BCE_RGB;
+    vHeader.ulIdentifier    = 0;
+
+    memset(&vInfo, '\0', sizeof(BITMAPINFO2));
+    vInfo.cbFix           = sizeof(vInfo);
+    vInfo.cx              = (USHORT)nWidth;
+    vInfo.cy              = (USHORT)nHeight;
+    vInfo.cPlanes         = 1L;
+    vInfo.cBitCount       = nDepth;
+    vInfo.usReserved      = 0;
+    vInfo.ulCompression   = BCA_UNCOMP;
+    vInfo.usRecording     = BRA_BOTTOMUP;
+    vInfo.usRendering     = BRH_NOTHALFTONED;
+    vInfo.ulColorEncoding = BCE_RGB;
+    vInfo.ulIdentifier    = 0;
+
+    HBITMAP                         hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo);
 
 
-    HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, 0L, NULL, &vInfo);
     if (!hBmp)
     {
         wxLogLastError("CreateBitmap");
     }
     if (!hBmp)
     {
         wxLogLastError("CreateBitmap");
     }
+    ::WinReleasePS(hPs);
     SetHBITMAP((WXHBITMAP)hBmp);
 } // end of wxBitmap::wxBitmap
 
     SetHBITMAP((WXHBITMAP)hBmp);
 } // end of wxBitmap::wxBitmap
 
-//
-// Create from XPM data
-//
-wxBitmap::wxBitmap(
-  char**                            ppData
-)
-{
-    Init();
-
-    (void)Create( (void *)ppData
-                 ,wxBITMAP_TYPE_XPM_DATA
-                 ,0
-                 ,0
-                 ,0
-                );
-} // end of wxBitmap::wxBitmap
-
-wxBitmap::wxBitmap(
-  const char**                      ppData
-)
-{
-    Init();
-
-    (void)Create( (void *)ppData
-                 ,wxBITMAP_TYPE_XPM_DATA
-                 ,0
-                 ,0
-                 ,0
-                );
-} // end of wxBitmap::wxBitmap
-
 wxBitmap::wxBitmap(
   int                               nW
 , int                               nH
 wxBitmap::wxBitmap(
   int                               nW
 , int                               nH
@@ -361,6 +381,27 @@ bool wxBitmap::Create(
     return Ok();
 } // end of wxBitmap::Create
 
     return Ok();
 } // end of wxBitmap::Create
 
+bool wxBitmap::CreateFromXpm(
+  const char**                      ppData
+)
+{
+#if wxUSE_IMAGE && wxUSE_XPM
+    Init();
+
+    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"))
+
+    *this = wxBitmap(vImg);
+    return TRUE;
+#else
+    return FALSE;
+#endif
+} // end of wxBitmap::CreateFromXpm
+
 bool wxBitmap::LoadFile(
   const wxString&                   rFilename
 , long                              lType
 bool wxBitmap::LoadFile(
   const wxString&                   rFilename
 , long                              lType
@@ -393,7 +434,7 @@ bool wxBitmap::LoadFile(
         if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() )
             return(FALSE);
 
         if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() )
             return(FALSE);
 
-        *this = vImage.ConvertToBitmap();
+        *this = wxBitmap(vImage);
 
         return(TRUE);
     }
 
         return(TRUE);
     }
@@ -453,7 +494,7 @@ bool wxBitmap::SaveFile(
     else
     {
         // FIXME what about palette? shouldn't we use it?
     else
     {
         // FIXME what about palette? shouldn't we use it?
-        wxImage                     vImage(*this);
+        wxImage                     vImage = ConvertToImage();
 
         if (!vImage.Ok())
             return(FALSE);
 
         if (!vImage.Ok())
             return(FALSE);
@@ -464,6 +505,499 @@ bool wxBitmap::SaveFile(
     }
 } // end of wxBitmap::SaveFile
 
     }
 } // end of wxBitmap::SaveFile
 
+
+// ----------------------------------------------------------------------------
+// wxImage-wxBitmap convertion
+// ----------------------------------------------------------------------------
+
+bool wxBitmap::CreateFromImage (
+  const wxImage&                    rImage
+, int                               nDepth
+)
+{
+    wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
+
+    int                             nSizeLimit = 1024 * 768 * 3;
+    int                             nWidth = GetWidth();
+    int                             nBmpHeight = GetHeight();
+    int                             nBytePerLine = nWidth * 3;
+    int                             nSizeDWORD = sizeof(DWORD);
+    int                             nLineBoundary = nBytePerLine % nSizeDWORD;
+    int                             nPadding = 0;
+
+    if (nLineBoundary > 0)
+    {
+        nPadding = nSizeDWORD - nLineBoundary;
+        nBytePerLine += nPadding;
+    }
+
+    //
+    // 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
+    {
+        nNumDIB  = nBmpHeight / nHeight;
+        nHRemain = nBmpHeight % nHeight;
+        if (nHRemain > 0)
+            nNumDIB++;
+    }
+
+    //
+    // Set bitmap parameters
+    //
+    wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
+    SetWidth(nWidth);
+    SetHeight(nBmpHeight);
+    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;
+
+    //
+    // Fill in the DIB header
+    //
+    memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
+    vHeader.cbFix           = sizeof(vHeader);
+    vHeader.cx              = (USHORT)nWidth;
+    vHeader.cy              = (USHORT)nHeight;
+    vHeader.cPlanes         = 1L;
+    vHeader.cBitCount       = 24;
+    vHeader.ulCompression   = BCA_UNCOMP;
+    vHeader.cbImage         = nBytePerLine * nHeight;
+    vHeader.cclrUsed        = 0;
+
+    //
+    // These seem not really needed for our purpose here.
+    //
+    vHeader.cxResolution    = 0;
+    vHeader.cyResolution    = 0;
+    vHeader.cclrImportant   = 0;
+    vHeader.usUnits         = BRU_METRIC;
+    vHeader.usReserved      = 0;
+    vHeader.cSize1          = 0;
+    vHeader.cSize2          = 0;
+    vHeader.usRecording     = BRA_BOTTOMUP;
+    vHeader.usRendering     = BRH_NOTHALFTONED;
+    vHeader.ulColorEncoding = BCE_RGB;
+    vHeader.ulIdentifier    = 0;
+
+    //
+    // Memory for DIB data
+    //
+    unsigned char*                  pucBits;
+
+    pucBits = (unsigned char *)malloc(vHeader.cbImage);
+    if(!pucBits)
+    {
+        wxFAIL_MSG(wxT("could not allocate memory for DIB"));
+        return FALSE;
+    }
+
+    //
+    // 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);
+    HBITMAP                         hBmp;
+    HBITMAP                         hBmpOld;
+
+    hBmp = ::GpiCreateBitmap( hPS
+                             ,&vHeader
+                             ,0L
+                             ,NULL
+                             ,NULL
+                            );
+    hBmpOld = ::GpiSetBitmap(hPS, hBmp);
+#if wxUSE_PALETTE
+    HPAL                            hOldPalette = NULLHANDLE;
+    if (rImage.GetPalette().Ok())
+    {
+        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;
+
+    for (n = 0; n < nNumDIB; n++)
+    {
+        if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0)
+        {
+            //
+            // Redefine height and size of the (possibly) last smaller DIB
+            // memory is not reallocated
+            //
+            nHeight         = nHRemain;
+            vHeader.cy      = (DWORD)(nHeight);
+            vHeader.cbImage = nBytePerLine * nHeight;
+        }
+        ptbits = pucBits;
+        for (j = 0; j < nHeight; j++)
+        {
+            for (i = 0; i < nWidth; i++)
+            {
+                *(ptbits++) = *(ptdata + 2);
+                *(ptbits++) = *(ptdata + 1);
+                *(ptbits++) = *(ptdata);
+                ptdata += 3;
+            }
+            for (i = 0; i < nPadding; i++)
+                *(ptbits++) = 0;
+        }
+
+        //
+        // Have to do something similar to WIN32's StretchDIBits, use GpiBitBlt
+        //
+        POINTL                      vPoint[4] = { 0, nOrigin,
+                                                  nWidth, nHeight,
+                                                  0, 0, nWidth, nHeight
+                                                };
+
+        ::GpiBitBlt( hPS
+                    ,hPS
+                    ,4
+                    ,vPoint
+                    ,ROP_SRCCOPY
+                    ,BBO_IGNORE
+                   );
+        nOrigin += nHeight;
+    }
+    SetHBITMAP((WXHBITMAP)hBmp);
+#if wxUSE_PALETTE
+    if (hOldPalette)
+        ::GpiSelectPalette(hPS, hOldPalette);
+#endif // wxUSE_PALETTE
+
+    //
+    // Similarly, created an mono-bitmap for the possible mask
+    //
+    if (rImage.HasMask())
+    {
+        memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
+        vHeader.cbFix     =  sizeof(BITMAPINFOHEADER2);
+        vHeader.cx        = nWidth;
+        vHeader.cy        = nHeight;
+        vHeader.cPlanes   = 1;
+        vHeader.cBitCount = 1;
+        hBmp = ::GpiCreateBitmap( hPS
+                                 ,&vHeader
+                                 ,0L
+                                 ,NULL
+                                 ,NULL
+                                );
+        hBmpOld = ::GpiSetBitmap(hPS, hBmp);
+        if (nNumDIB == 1)
+            nHeight = nBmpHeight;
+        else
+            nHeight = nSizeLimit / nBytePerLine;
+        vHeader.cy = (DWORD)(nHeight);
+        vHeader.cbImage = nBytePerLine * 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 (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0)
+            {
+                //
+                // Redefine height and size of the (possibly) last smaller DIB
+                // memory is not reallocated
+                //
+                nHeight         = nHRemain;
+                vHeader.cy      = (DWORD)(nHeight);
+                vHeader.cbImage = nBytePerLine * nHeight;
+            }
+            ptbits = pucBits;
+            for (int j = 0; j < nHeight; j++)
+            {
+                for (i = 0; i < nWidth; i++)
+                {
+                    if ((*(ptdata++) != cRed) || (*(ptdata++) != cGreen) || (*(ptdata++) != cBlue))
+                    {
+                        *(ptbits++) = cOne;
+                        *(ptbits++) = cOne;
+                        *(ptbits++) = cOne;
+                    }
+                    else
+                    {
+                        *(ptbits++) = cZero;
+                        *(ptbits++) = cZero;
+                        *(ptbits++) = cZero;
+                    }
+                }
+                for (i = 0; i < nPadding; i++)
+                    *(ptbits++) = cZero;
+            }
+            POINTL                  vPoint[4] = { 0, nOrigin,
+                                                  nWidth, nHeight,
+                                                  0, 0, nWidth, nHeight
+                                                };
+
+            ::GpiBitBlt( hPS
+                        ,hPS
+                        ,4
+                        ,vPoint
+                        ,ROP_SRCCOPY
+                        ,BBO_IGNORE
+                       );
+            nOrigin += nHeight;
+        }
+
+        //
+        // Create a wxMask object
+        //
+        wxMask*                     pMask = new wxMask();
+
+        pMask->SetMaskBitmap((WXHBITMAP)hBmp);
+        SetMask(pMask);
+        hBmpOld = ::GpiSetBitmap(hPS, hBmp);
+    }
+
+    //
+    // Free allocated resources
+    //
+    ::GpiSetBitmap(hPS, NULLHANDLE);
+    ::GpiDestroyPS(hPS);
+    ::DevCloseDC(hDC);
+    free(pucBits);
+    return TRUE;
+} // end of wxBitmap::CreateFromImage
+
+wxImage wxBitmap::ConvertToImage() const
+{
+    wxImage                         vImage;
+
+    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+
+    //
+    // 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;
+    HDC                             hDCMem;
+    PSZ                             pszData[4] = { "Display", NULL, NULL, NULL };
+    HPS                             hPSMem;
+    HPS                             hPS;
+    SIZEL                           vSizlPage = {0,0};
+    HBITMAP                         hBitmap;
+
+    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', sizeof(BITMAPINFOHEADER2));
+    vDIBh.cbFix     =  sizeof(BITMAPINFOHEADER2);
+    vDIBh.cx        = nWidth;
+    vDIBh.cy        = nHeight;
+    vDIBh.cPlanes   = 1;
+    vDIBh.cbImage   = nBytePerLine * nHeight;
+    vDIBh.cBitCount = 24;
+
+    memset(&vDIBInfo, '\0', sizeof(BITMAPINFO2));
+    vDIBInfo.cbFix           = sizeof(BITMAPINFO2);
+    vDIBInfo.cPlanes         = 1;
+    vDIBInfo.cBitCount       = 24;
+    vDIBInfo.ulCompression   = BCA_UNCOMP;
+    vDIBInfo.usReserved      = 0;
+    vDIBInfo.usRecording     = BRA_BOTTOMUP;
+    vDIBInfo.usRendering     = BRH_NOTHALFTONED;
+    vDIBInfo.ulColorEncoding = BCE_RGB;
+    vDIBInfo.ulIdentifier    = 0;
+
+    lpBits = (unsigned char *)malloc(vDIBh.cbImage);
+    if (!lpBits)
+    {
+        wxFAIL_MSG(wxT("could not allocate data for DIB"));
+        free(pData);
+        return wxNullImage;
+    }
+
+    //
+    // Copy data from the device-dependent bitmap to the DIB
+    //
+    hDCMem = ::DevOpenDC( vHabmain
+                         ,OD_MEMORY
+                         ,"*"
+                         ,4
+                         ,(PDEVOPENDATA)pszData
+                         ,NULLHANDLE
+                        );
+    hPSMem = ::GpiCreatePS( vHabmain
+                           ,hDCMem
+                           ,&vSizlPage
+                           ,PU_PELS | GPIA_ASSOC | GPIT_MICRO
+                          );
+    hBitmap = ::GpiCreateBitmap( hPSMem
+                                ,&vDIBh
+                                ,0L
+                                ,NULL
+                                ,NULL
+                               );
+    lScans = ::GpiQueryBitmapBits( hPSMem
+                                  ,0L
+                                  ,(LONG)nHeight
+                                  ,(PBYTE)lpBits
+                                  ,&vDIBInfo
+                                 );
+
+    //
+    // 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 < nWidth; j++)
+        {
+            *(ptdata++) = *(ptbits+2);
+            *(ptdata++) = *(ptbits+1);
+            *(ptdata++) = *(ptbits  );
+            ptbits += 3;
+        }
+        ptbits += nPadding;
+    }
+
+    //
+    // Similarly, set data according to the possible mask bitmap
+    //
+    if (GetMask() && GetMask()->GetMaskBitmap())
+    {
+        hBitmap = (HBITMAP)GetMask()->GetMaskBitmap();
+
+        //
+        // Memory DC/PS created, color set, data copied, and memory DC/PS deleted
+        //
+        HDC                         hMemDC = ::DevOpenDC( vHabmain
+                                                         ,OD_MEMORY
+                                                         ,"*"
+                                                         ,4
+                                                         ,(PDEVOPENDATA)pszData
+                                                         ,NULLHANDLE
+                                                        );
+        HPS                         hMemPS = ::GpiCreatePS( vHabmain
+                                                           ,hMemDC
+                                                           ,&vSizlPage
+                                                           ,PU_PELS | GPIA_ASSOC | GPIT_MICRO
+                                                          );
+        ::GpiSetColor(hMemPS, OS2RGB(0, 0, 0));
+        ::GpiSetBackColor(hMemPS, OS2RGB(255, 255, 255) );
+        ::GpiQueryBitmapBits( hPSMem
+                             ,0L
+                             ,(LONG)nHeight
+                             ,(PBYTE)lpBits
+                             ,&vDIBInfo
+                            );
+        ::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 < nHeight; i++)
+        {
+            for (j = 0; j < nWidth; j++)
+            {
+                if (*ptbits != 0)
+                    ptdata += 3;
+                else
+                {
+                    *(ptdata++)  = ucRed;
+                    *(ptdata++)  = ucGreen;
+                    *(ptdata++)  = ucBlue;
+                }
+                ptbits += 3;
+            }
+            ptbits += nPadding;
+        }
+        vImage.SetMaskColour( ucRed
+                             ,ucGreen
+                             ,ucBlue
+                            );
+        vImage.SetMask(TRUE);
+    }
+    else
+    {
+        vImage.SetMask(FALSE);
+    }
+
+    //
+    // Free allocated resources
+    //
+    ::GpiDestroyPS(hPSMem);
+    ::DevCloseDC(hDCMem);
+    free(lpBits);
+    return vImage;
+} // end of wxBitmap::ConvertToImage
+
 // ----------------------------------------------------------------------------
 // sub bitmap extraction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // sub bitmap extraction
 // ----------------------------------------------------------------------------
@@ -598,34 +1132,11 @@ void wxBitmap::SetMask(
     GetBitmapData()->m_pBitmapMask = pMask;
 } // end of wxBitmap::SetMask
 
     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&                             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
 
 // ----------------------------------------------------------------------------
 } // end of wxBitmap::GetBitmapForDC
 
 // ----------------------------------------------------------------------------
@@ -989,24 +1500,24 @@ HBITMAP wxInvertMask(
                                    ,&vBmhdr
                                   );
         nWidth  = (int)vBmhdr.cx;
                                    ,&vBmhdr
                                   );
         nWidth  = (int)vBmhdr.cx;
-        nHeight = (int)vBmhdr.cyt;
+        nHeight = (int)vBmhdr.cy;
     }
 
     BITMAPINFOHEADER2               vBmih;
     SIZEL                           vSize = {0, 0};
     DEVOPENSTRUC                    vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     }
 
     BITMAPINFOHEADER2               vBmih;
     SIZEL                           vSize = {0, 0};
     DEVOPENSTRUC                    vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
-    HDC                             hDCSrc = ::DevOpenDC(ghAb, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
-    HDC                             hDCDst = ::DevOpenDC(ghAb, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
-    HPS                             hPSSrc = ::GpiCreatePS(ghAb, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
-    HPS                             hPSDst = ::GpiCreatePS(ghAb, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
-    POINTL                          vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(),
-                                                  0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
+    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, nWidth, nHeight,
+                                                  0, 0, nWidth, nHeight
                                                 };
 
                                                 };
 
-    memset(&vBmih, NULLC, sizeof(BITMAPINFOHEADER2));
+    memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
     vBmih.cbFix     =  sizeof(BITMAPINFOHEADER2);
     vBmih.cbFix     =  sizeof(BITMAPINFOHEADER2);
-    vBmih.cx        = lWidth;
-    vBmih.cy        = lHeight;
+    vBmih.cx        = nWidth;
+    vBmih.cy        = nHeight;
     vBmih.cPlanes   = 1;
     vBmih.cBitCount = 1;
 
     vBmih.cPlanes   = 1;
     vBmih.cBitCount = 1;
 
@@ -1023,15 +1534,16 @@ HBITMAP wxInvertMask(
     ::GpiBitBlt( hPSDst
                 ,hPSSrc
                 ,4L
     ::GpiBitBlt( hPSDst
                 ,hPSSrc
                 ,4L
-                ,&vPoint
-                ,ROP_SRCCOPY
+                ,vPoint
+                ,ROP_SRCINVERT
                 ,BBO_IGNORE
                );
 
     ::GpiDestroyPS(hPSSrc);
     ::GpiDestroyPS(hPSDst);
     ::DevCloseDC(hDCSrc);
                 ,BBO_IGNORE
                );
 
     ::GpiDestroyPS(hPSSrc);
     ::GpiDestroyPS(hPSDst);
     ::DevCloseDC(hDCSrc);
-    ::DevCloseDC(hDCDtl);
+    ::DevCloseDC(hDCDst);
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
+