correct bug with using uninitialized end variable (unused variable warnings are not...

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 9d81414df6f7f150183a2d461e298f82d3670ce9..6f9f968eb15b10a42afbdb162d7b21327a2fe48d 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/os2/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxBitmap
 // Author:      David Webster
 // Modified by:


@@ -9,13 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "bitmap.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/bitmap.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -24,15 +22,14 @@
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"

-    #include "wx/bitmap.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

+    #include "wx/log.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

+#include "wx/os2/dc.h"

 #include "wx/os2/private.h"
 #include "wx/os2/private.h"

-#include "wx/log.h"

 
 

-//#include "wx/msw/dib.h"
-#include "wx/image.h"

 #include "wx/xpmdecod.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/xpmdecod.h"
 
 // ----------------------------------------------------------------------------


@@ -61,17 +58,30 @@ wxBitmapRefData::wxBitmapRefData()
     m_hBitmap       = (WXHBITMAP) NULL;
 } // end of wxBitmapRefData::wxBitmapRefData
 
     m_hBitmap       = (WXHBITMAP) NULL;
 } // end of wxBitmapRefData::wxBitmapRefData
 

+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
+{
+    m_nQuality = tocopy.m_nQuality;
+    m_pSelectedInto = NULL;     // don't copy this
+    m_nNumColors    = tocopy.m_nNumColors;
+
+    // copy the mask
+    if (tocopy.m_pBitmapMask)
+        m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask);
+
+    m_hBitmap = wxCopyBmp(tocopy.m_hBitmap);
+}
+

 void wxBitmapRefData::Free()
 {
     if ( m_pSelectedInto )
     {
 void wxBitmapRefData::Free()
 {
     if ( m_pSelectedInto )
     {

-        wxLogLastError("GpiDeleteBitmap(hbitmap)");
+        wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));

     }
     if (m_hBitmap)
     {
         if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap))
         {
     }
     if (m_hBitmap)
     {
         if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap))
         {

-            wxLogLastError("GpiDeleteBitmap(hbitmap)");
+            wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));

         }
     }
     if (m_pBitmapMask)
         }
     }
     if (m_pBitmapMask)


@@ -85,18 +95,21 @@ void wxBitmapRefData::Free()
 // wxBitmap creation
 // ----------------------------------------------------------------------------
 
 // wxBitmap creation
 // ----------------------------------------------------------------------------
 

+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
+{
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
+}
+

 // 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_bIsMono = FALSE;
+    m_bIsMono = false;

     //
     // True for all bitmaps created from bits, wxImages, Xpms
     //
 } // end of wxBitmap::Init
 
     //
     // True for all bitmaps created from bits, wxImages, Xpms
     //
 } // end of wxBitmap::Init
 

-bool wxBitmap::CopyFromIconOrCursor(
-  const wxGDIImage&                 rIcon
-)
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon)

 {
     HPOINTER                        hIcon = (HPOINTER)rIcon.GetHandle();
     POINTERINFO                     SIconInfo;
 {
     HPOINTER                        hIcon = (HPOINTER)rIcon.GetHandle();
     POINTERINFO                     SIconInfo;


@@ -104,7 +117,7 @@ bool wxBitmap::CopyFromIconOrCursor(
     if (!::WinQueryPointerInfo(hIcon, &SIconInfo))
     {
         wxLogLastError(wxT("WinQueryPointerInfo"));
     if (!::WinQueryPointerInfo(hIcon, &SIconInfo))
     {
         wxLogLastError(wxT("WinQueryPointerInfo"));

-        return FALSE;
+        return false;

     }
     wxBitmapRefData*                pRefData = new wxBitmapRefData;
 
     }
     wxBitmapRefData*                pRefData = new wxBitmapRefData;
 


@@ -124,7 +137,7 @@ bool wxBitmap::CopyFromIconOrCursor(
     pMask->SetMaskBitmap(GetHBITMAP());
     SetMask(pMask);
 
     pMask->SetMaskBitmap(GetHBITMAP());
     SetMask(pMask);
 

-    return(TRUE);
+    return true;

 } // end of wxBitmap::CopyFromIconOrCursor
 
 bool wxBitmap::CopyFromCursor(
 } // end of wxBitmap::CopyFromIconOrCursor
 
 bool wxBitmap::CopyFromCursor(


@@ -134,7 +147,7 @@ bool wxBitmap::CopyFromCursor(
     UnRef();
 
     if (!rCursor.Ok())
     UnRef();
 
     if (!rCursor.Ok())

-        return(FALSE);
+        return(false);

     return(CopyFromIconOrCursor(rCursor));
 } // end of wxBitmap::CopyFromCursor
 
     return(CopyFromIconOrCursor(rCursor));
 } // end of wxBitmap::CopyFromCursor
 


@@ -145,7 +158,7 @@ bool wxBitmap::CopyFromIcon(
     UnRef();
 
     if (!rIcon.Ok())
     UnRef();
 
     if (!rIcon.Ok())

-        return(FALSE);
+        return(false);

 
     return CopyFromIconOrCursor(rIcon);
 } // end of wxBitmap::CopyFromIcon
 
     return CopyFromIconOrCursor(rIcon);
 } // end of wxBitmap::CopyFromIcon


@@ -186,7 +199,7 @@ wxBitmap::wxBitmap(
     hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS);
     if (hPs == 0)
     {
     hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS);
     if (hPs == 0)
     {

-        wxLogLastError("GpiCreatePS Failure");
+        wxLogLastError(wxT("GpiCreatePS Failure"));

     }
 
     if (nDepth == 1)
     }
 
     if (nDepth == 1)


@@ -194,7 +207,7 @@ wxBitmap::wxBitmap(
         //
         // 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
         //
         // 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!
+        // line is reversed!

         //
         const size_t                nBytesPerLine = (nWidth + 7) / 8;
         const size_t                nPadding = nBytesPerLine % 2;
         //
         const size_t                nBytesPerLine = (nWidth + 7) / 8;
         const size_t                nPadding = nBytesPerLine % 2;


@@ -211,14 +224,14 @@ wxBitmap::wxBitmap(
         {
             for (nCols = 0; nCols < nBytesPerLine; nCols++)
             {
         {
             for (nCols = 0; nCols < nBytesPerLine; nCols++)
             {

-                unsigned char       ucVal = *pzSrc++;
-                unsigned char       ucReversed = 0;
-                int                 nBits;
+                unsigned char ucVal = *pzSrc++;
+                unsigned char ucReversed = 0;
+                int nBits;

 
                 for (nBits = 0; nBits < 8; nBits++)
                 {
                     ucReversed <<= 1;
 
                 for (nBits = 0; nBits < 8; nBits++)
                 {
                     ucReversed <<= 1;

-                    ucReversed |= (ucVal & 0x01);
+                    ucReversed = (unsigned char)(ucReversed | (ucVal & 0x01));

                     ucVal >>= 1;
                 }
                 *pzDst++ = ucReversed;
                     ucVal >>= 1;
                 }
                 *pzDst++ = ucReversed;


@@ -242,7 +255,7 @@ wxBitmap::wxBitmap(
     vHeader.cx              = (USHORT)nWidth;
     vHeader.cy              = (USHORT)nHeight;
     vHeader.cPlanes         = 1L;
     vHeader.cx              = (USHORT)nWidth;
     vHeader.cy              = (USHORT)nHeight;
     vHeader.cPlanes         = 1L;

-    vHeader.cBitCount       = nDepth;
+    vHeader.cBitCount       = (USHORT)nDepth;

     vHeader.usReserved      = 0;
 
     memset(&vInfo, '\0', 16);
     vHeader.usReserved      = 0;
 
     memset(&vInfo, '\0', 16);


@@ -250,13 +263,13 @@ wxBitmap::wxBitmap(
     vInfo.cx              = (USHORT)nWidth;
     vInfo.cy              = (USHORT)nHeight;
     vInfo.cPlanes         = 1L;
     vInfo.cx              = (USHORT)nWidth;
     vInfo.cy              = (USHORT)nHeight;
     vInfo.cPlanes         = 1L;

-    vInfo.cBitCount       = nDepth;
+    vInfo.cBitCount       = (USHORT)nDepth;

 
     HBITMAP                         hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo);
 
     if (!hBmp)
     {
 
     HBITMAP                         hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo);
 
     if (!hBmp)
     {

-        wxLogLastError("CreateBitmap");
+        wxLogLastError(wxT("CreateBitmap"));

     }
     ::GpiDestroyPS(hPs);
     ::DevCloseDC(hDc);
     }
     ::GpiDestroyPS(hPs);
     ::DevCloseDC(hDc);


@@ -264,21 +277,8 @@ wxBitmap::wxBitmap(
 } // end of wxBitmap::wxBitmap
 
 wxBitmap::wxBitmap(
 } // end of wxBitmap::wxBitmap
 
 wxBitmap::wxBitmap(

-  int                               nW
-, int                               nH
-, int                               nD
-)
-{
-    Init();
-    (void)Create( nW
-                 ,nH
-                 ,nD
-                );
-} // end of wxBitmap::wxBitmap
-
-wxBitmap::wxBitmap(
-  void*                             pData
-, long                              lType
+  const void*                       pData
+, wxBitmapType                      lType

 , int                               nWidth
 , int                               nHeight
 , int                               nDepth
 , int                               nWidth
 , int                               nHeight
 , int                               nDepth


@@ -296,12 +296,12 @@ wxBitmap::wxBitmap(
 
 wxBitmap::wxBitmap(
   int                               nId
 
 wxBitmap::wxBitmap(
   int                               nId

-, long                              lType
+, wxBitmapType                      lType

 )
 {
     Init();
     LoadFile( nId
 )
 {
     Init();
     LoadFile( nId

-             ,(int)lType
+             ,lType

             );
     SetId(nId);
 } // end of wxBitmap::wxBitmap
             );
     SetId(nId);
 } // end of wxBitmap::wxBitmap


@@ -334,7 +334,7 @@ bool wxBitmap::Create(
         HPS                         hPS   = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
 
         if (nD == 1)
         HPS                         hPS   = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
 
         if (nD == 1)

-            m_bIsMono = TRUE;
+            m_bIsMono = true;

         memset(&vHeader, '\0', 16);
         vHeader.cbFix     =  16;
         vHeader.cx        = nW;
         memset(&vHeader, '\0', 16);
         vHeader.cbFix     =  16;
         vHeader.cx        = nW;


@@ -369,7 +369,7 @@ bool wxBitmap::Create(
         vHeader.cx        = nW;
         vHeader.cy        = nH;
         vHeader.cPlanes   = 1;
         vHeader.cx        = nW;
         vHeader.cy        = nH;
         vHeader.cPlanes   = 1;

-        vHeader.cBitCount = lBitCount;
+        vHeader.cBitCount = (USHORT)lBitCount;

 
         hBmp = ::GpiCreateBitmap( hPSScreen
                                  ,&vHeader
 
         hBmp = ::GpiCreateBitmap( hPSScreen
                                  ,&vHeader


@@ -386,30 +386,37 @@ bool wxBitmap::Create(
     return Ok();
 } // end of wxBitmap::Create
 
     return Ok();
 } // end of wxBitmap::Create
 

-bool wxBitmap::CreateFromXpm(
-  const char**                      ppData
-)
+bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)

 {
 {

-#if wxUSE_IMAGE && wxUSE_XPM
-    Init();
+    UnRef();
+
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);

 
 

-    wxCHECK_MSG(ppData != NULL, FALSE, wxT("invalid bitmap data"))
+    if ( handler )
+    {
+        m_refData = new wxBitmapRefData;

 
 

-    wxXPMDecoder                    vDecoder;
-    wxImage                         vImg = vDecoder.ReadData(ppData);
+        return handler->LoadFile(this, filename, type, -1, -1);
+    }
+#if wxUSE_IMAGE
+    else // no bitmap handler found
+    {
+        wxImage image;
+        if ( image.LoadFile( filename, type ) && image.Ok() )
+        {
+            *this = wxBitmap(image);

 
 

-    wxCHECK_MSG(vImg.Ok(), FALSE, wxT("invalid bitmap data"))
+            return true;
+        }
+    }
+#endif // wxUSE_IMAGE

 
 

-    *this = wxBitmap(vImg);
-    return TRUE;
-#else
-    return FALSE;
-#endif
-} // end of wxBitmap::CreateFromXpm
+    return false;
+}

 
 bool wxBitmap::LoadFile(
   int                               nId
 
 bool wxBitmap::LoadFile(
   int                               nId

-, long                              lType
+, wxBitmapType                      lType

 )
 {
     UnRef();
 )
 {
     UnRef();


@@ -431,13 +438,13 @@ bool wxBitmap::LoadFile(
     }
     else
     {
     }
     else
     {

-        return(FALSE);
+        return false;

     }
 } // end of wxBitmap::LoadFile
 
 bool wxBitmap::Create(
     }
 } // end of wxBitmap::LoadFile
 
 bool wxBitmap::Create(

-  void*                             pData
-, long                              lType
+  const void*                       pData
+, wxBitmapType                      lType

 , int                               nWidth
 , int                               nHeight
 , int                               nDepth
 , int                               nWidth
 , int                               nHeight
 , int                               nDepth


@@ -453,7 +460,7 @@ bool wxBitmap::Create(
     {
         wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), lType);
 
     {
         wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), lType);
 

-        return(FALSE);
+        return false;

     }
 
     m_refData = new wxBitmapRefData;
     }
 
     m_refData = new wxBitmapRefData;


@@ -469,7 +476,7 @@ bool wxBitmap::Create(
 
 bool wxBitmap::SaveFile(
   const wxString&                   rFilename
 
 bool wxBitmap::SaveFile(
   const wxString&                   rFilename

-, int                               lType
+, wxBitmapType                      lType

 , const wxPalette*                  pPalette
 )
 {
 , const wxPalette*                  pPalette
 )
 {


@@ -491,7 +498,7 @@ bool wxBitmap::SaveFile(
         wxImage                     vImage = ConvertToImage();
 
         if (!vImage.Ok())
         wxImage                     vImage = ConvertToImage();
 
         if (!vImage.Ok())

-            return(FALSE);
+            return false;

 
         return(vImage.SaveFile( rFilename
                                ,lType
 
         return(vImage.SaveFile( rFilename
                                ,lType


@@ -509,7 +516,7 @@ bool wxBitmap::CreateFromImage (
 , int                               nDepth
 )
 {
 , int                               nDepth
 )
 {

-    wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
+    wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));

     m_refData = new wxBitmapRefData();
 
     int                             nSizeLimit = 1024 * 768 * 3;
     m_refData = new wxBitmapRefData();
 
     int                             nSizeLimit = 1024 * 768 * 3;


@@ -546,13 +553,13 @@ bool wxBitmap::CreateFromImage (
     //
     // Set bitmap parameters
     //
     //
     // Set bitmap parameters
     //

-    wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
+    wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));

     SetWidth(nWidth);
     SetHeight(nBmpHeight);
     if (nDepth == 1)
     SetWidth(nWidth);
     SetHeight(nBmpHeight);
     if (nDepth == 1)

-        m_bIsMono = TRUE;
+        m_bIsMono = true;

     else
     else

-        m_bIsMono = FALSE;
+        m_bIsMono = false;

     if (nDepth == -1)
         nDepth = wxDisplayDepth();
     SetDepth(nDepth);
     if (nDepth == -1)
         nDepth = wxDisplayDepth();
     SetDepth(nDepth);


@@ -589,7 +596,7 @@ bool wxBitmap::CreateFromImage (
     if(!pucBits)
     {
         wxFAIL_MSG(wxT("could not allocate memory for DIB"));
     if(!pucBits)
     {
         wxFAIL_MSG(wxT("could not allocate memory for DIB"));

-        return FALSE;
+        return false;

     }
     memset(pucBits, '\0', (nBytePerLine * nHeight));
 
     }
     memset(pucBits, '\0', (nBytePerLine * nHeight));
 


@@ -829,7 +836,7 @@ bool wxBitmap::CreateFromImage (
     ::DevCloseDC(hDCScreen);
     ::DevCloseDC(hDC);
     free(pucBits);
     ::DevCloseDC(hDCScreen);
     ::DevCloseDC(hDC);
     free(pucBits);

-    return TRUE;
+    return true;

 } // end of wxBitmap::CreateFromImage
 
 wxImage wxBitmap::ConvertToImage() const
 } // end of wxBitmap::CreateFromImage
 
 wxImage wxBitmap::ConvertToImage() const


@@ -860,7 +867,7 @@ wxImage wxBitmap::ConvertToImage() const
     HBITMAP                         hOldBitmap;
     DEVOPENSTRUC                    vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     SIZEL                           vSizlPage = {0,0};
     HBITMAP                         hOldBitmap;
     DEVOPENSTRUC                    vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     SIZEL                           vSizlPage = {0,0};

-    HDC                             hDCMem;
+    HDC                             hDCMem = NULLHANDLE;

 
     vImage.Create( nWidth
                   ,nHeight
 
     vImage.Create( nWidth
                   ,nHeight


@@ -909,9 +916,12 @@ wxImage wxBitmap::ConvertToImage() const
     //
     // May already be selected into a PS
     //
     //
     // May already be selected into a PS
     //

-    if ((pDC = GetSelectedInto()) != NULL)
+    pDC = GetSelectedInto();
+    const wxPMDCImpl *impl; 
+    if (pDC != NULL &&
+        (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)

     {
     {

-        hPSMem = pDC->GetHPS();
+        hPSMem = impl->GetHPS();

     }
     else
     {
     }
     else
     {


@@ -1044,11 +1054,11 @@ wxImage wxBitmap::ConvertToImage() const
                              ,ucGreen
                              ,ucBlue
                             );
                              ,ucGreen
                              ,ucBlue
                             );

-        vImage.SetMask(TRUE);
+        vImage.SetMask(true);

     }
     else
     {
     }
     else
     {

-        vImage.SetMask(FALSE);
+        vImage.SetMask(false);

     }
 
     //
     }
 
     //


@@ -1181,9 +1191,7 @@ void wxBitmap::SetMask(
     GetBitmapData()->m_pBitmapMask = pMask;
 } // end of wxBitmap::SetMask
 
     GetBitmapData()->m_pBitmapMask = pMask;
 } // end of wxBitmap::SetMask
 

-wxBitmap wxBitmap::GetBitmapForDC(
-  wxDC&                             rDc
-) const
+wxBitmap wxBitmap::GetBitmapForDC(wxDC& WXUNUSED(rDc)) const

 {
     return(*this);
 } // end of wxBitmap::GetBitmapForDC
 {
     return(*this);
 } // end of wxBitmap::GetBitmapForDC


@@ -1197,6 +1205,11 @@ wxMask::wxMask()
     m_hMaskBitmap = 0;
 } // end of wxMask::wxMask
 
     m_hMaskBitmap = 0;
 } // end of wxMask::wxMask
 

+wxMask::wxMask(const wxMask& tocopy)
+{
+    m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap);
+} // end of wxMask::wxMask
+

 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask(
 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask(


@@ -1261,7 +1274,7 @@ bool wxMask::Create(
     }
     if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
     {
     }
     if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
     {

-        return(FALSE);
+        return false;

     }
 
     memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
     }
 
     memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));


@@ -1292,7 +1305,7 @@ bool wxMask::Create(
     ::GpiDestroyPS(hPSDst);
     ::DevCloseDC(hDCSrc);
     ::DevCloseDC(hDCDst);
     ::GpiDestroyPS(hPSDst);
     ::DevCloseDC(hDCSrc);
     ::DevCloseDC(hDCDst);

-    return(TRUE);
+    return true;

 } // end of wxMask::Create
 
 // Create a mask from a bitmap and a palette index indicating
 } // end of wxMask::Create
 
 // Create a mask from a bitmap and a palette index indicating


@@ -1329,7 +1342,7 @@ bool wxMask::Create(
                           ));
         }
     }
                           ));
         }
     }

-    return(FALSE);
+    return false;

 } // end of wxMask::Create
 
 // Create a mask from a bitmap and a colour indicating
 } // end of wxMask::Create
 
 // Create a mask from a bitmap and a colour indicating


@@ -1339,7 +1352,7 @@ bool wxMask::Create(
 , const wxColour&                   rColour
 )
 {
 , const wxColour&                   rColour
 )
 {

-    bool                            bOk = TRUE;
+    bool                            bOk = true;

     COLORREF                        vMaskColour = OS2RGB( rColour.Red()
                                                          ,rColour.Green()
                                                          ,rColour.Blue()
     COLORREF                        vMaskColour = OS2RGB( rColour.Red()
                                                          ,rColour.Green()
                                                          ,rColour.Blue()


@@ -1359,7 +1372,7 @@ bool wxMask::Create(
     }
     if (!rBitmap.Ok())
     {
     }
     if (!rBitmap.Ok())
     {

-        return(FALSE);
+        return false;

     }
 
     //
     }
 
     //


@@ -1400,7 +1413,7 @@ bool wxMask::Create(
                 //
                 // Doesn't make sense to continue
                 //
                 //
                 // Doesn't make sense to continue
                 //

-                bOk = FALSE;
+                bOk = false;

                 break;
             }
 
                 break;
             }
 


@@ -1422,38 +1435,37 @@ bool wxMask::Create(
     ::GpiDestroyPS(hPSDst);
     ::DevCloseDC(hDCSrc);
     ::DevCloseDC(hDCDst);
     ::GpiDestroyPS(hPSDst);
     ::DevCloseDC(hDCSrc);
     ::DevCloseDC(hDCDst);

-    return(TRUE);
+    return true;

 } // end of wxMask::Create
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 
 } // end of wxMask::Create
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 

-bool wxBitmapHandler::Create(
-  wxGDIImage*                       pImage
-, void*                             pData
-, long                              lFlags
-, int                               nWidth
-, int                               nHeight
-, int                               nDepth
-)
+bool wxBitmapHandler::Create( wxGDIImage* pImage,
+                              const void* pData,
+                              wxBitmapType lType,
+                              int         nWidth,
+                              int         nHeight,
+                              int         nDepth)

 {
 {

-    wxBitmap*                       pBitmap = wxDynamicCast( pImage
-                                                            ,wxBitmap
-                                                           );
+    wxBitmap* pBitmap = wxDynamicCast( pImage
+                                      ,wxBitmap
+                                       );

 
     return(pBitmap ? Create( pBitmap
                             ,pData
 
     return(pBitmap ? Create( pBitmap
                             ,pData

+                            ,lType

                             ,nWidth
                             ,nHeight
                             ,nDepth
                             ,nWidth
                             ,nHeight
                             ,nDepth

-                           ) : FALSE);
+                           ) : false);

 }
 
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 , int                               nId
 }
 
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 , int                               nId

-, long                              lFlags
+, wxBitmapType                      lFlags

 , int                               nWidth
 , int                               nHeight
 )
 , int                               nWidth
 , int                               nHeight
 )


@@ -1467,14 +1479,14 @@ bool wxBitmapHandler::Load(
                               ,lFlags
                               ,nWidth
                               ,nHeight
                               ,lFlags
                               ,nWidth
                               ,nHeight

-                             ) : FALSE);
+                             ) : false);

 }
 
 bool wxBitmapHandler::Save(
 }
 
 bool wxBitmapHandler::Save(

-  wxGDIImage*                       pImage
+  const wxGDIImage*                 pImage

 , const wxString&                   rName
 , const wxString&                   rName

-, int                               lType
-)
+, wxBitmapType                      lType
+) const

 {
     wxBitmap*                       pBitmap = wxDynamicCast( pImage
                                                             ,wxBitmap
 {
     wxBitmap*                       pBitmap = wxDynamicCast( pImage
                                                             ,wxBitmap


@@ -1483,40 +1495,51 @@ bool wxBitmapHandler::Save(
     return(pBitmap ? SaveFile( pBitmap
                               ,rName
                               ,lType
     return(pBitmap ? SaveFile( pBitmap
                               ,rName
                               ,lType

-                             ) : FALSE);
+                             ) : false);

 }
 
 bool wxBitmapHandler::Create(
   wxBitmap*                         WXUNUSED(pBitmap)
 }
 
 bool wxBitmapHandler::Create(
   wxBitmap*                         WXUNUSED(pBitmap)

-, void*                             WXUNUSED(pData)
-, long                              WXUNUSED(lType)
+, const void*                       WXUNUSED(pData)
+, wxBitmapType                      WXUNUSED(lType)

 , int                               WXUNUSED(nWidth)
 , int                               WXUNUSED(nHeight)
 , int                               WXUNUSED(nDepth)
 )
 {
 , int                               WXUNUSED(nWidth)
 , int                               WXUNUSED(nHeight)
 , int                               WXUNUSED(nDepth)
 )
 {

-    return(FALSE);
+    return false;

 }
 
 bool wxBitmapHandler::LoadFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , int                               WXUNUSED(nId)
 }
 
 bool wxBitmapHandler::LoadFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , int                               WXUNUSED(nId)

-, long                              WXUNUSED(lType)
+, wxBitmapType                      WXUNUSED(lType)

 , int                               WXUNUSED(nDesiredWidth)
 , int                               WXUNUSED(nDesiredHeight)
 )
 {
 , int                               WXUNUSED(nDesiredWidth)
 , int                               WXUNUSED(nDesiredHeight)
 )
 {

-    return(FALSE);
+    return false;
+}
+
+bool wxBitmapHandler::LoadFile(
+  wxBitmap*                         WXUNUSED(pBitmap)
+, const wxString&                   WXUNUSED(rName)
+, wxBitmapType                      WXUNUSED(lType)
+, int                               WXUNUSED(nDesiredWidth)
+, int                               WXUNUSED(nDesiredHeight)
+)
+{
+    return false;

 }
 
 bool wxBitmapHandler::SaveFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const wxString&                   WXUNUSED(rName)
 }
 
 bool wxBitmapHandler::SaveFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const wxString&                   WXUNUSED(rName)

-, int                               WXUNUSED(nType)
+, wxBitmapType                      WXUNUSED(nType)

 , const wxPalette*                  WXUNUSED(pPalette)
 , const wxPalette*                  WXUNUSED(pPalette)

-)
+) const

 {
 {

-    return(FALSE);
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1590,3 +1613,83 @@ HBITMAP wxInvertMask(
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 

+HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight )
+{
+    wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxCopyBmp") );
+
+    //
+    // Get width/height from the bitmap if not given
+    //
+    if (!nWidth || !nHeight)
+    {
+        BITMAPINFOHEADER2 vBmhdr;
+
+        vBmhdr.cbFix  = 16;
+        ::GpiQueryBitmapInfoHeader( hBmp,
+                                    &vBmhdr );
+        nWidth        = (int)vBmhdr.cx;
+        nHeight       = (int)vBmhdr.cy;
+    }
+
+    BITMAPINFOHEADER2 vBmih;
+    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,      nHeight},
+                                    {nWidth, 0},
+                                    {0,      0},
+                                    {nWidth, nHeight} };
+    if (!flip)
+    {
+        vPoint[0].y = 0;
+        vPoint[1].y = nHeight;
+    }
+    memset(&vBmih, '\0', 16);
+    vBmih.cbFix     = 16;
+    vBmih.cx        = nWidth;
+    vBmih.cy        = nHeight;
+    vBmih.cPlanes   = 1;
+    vBmih.cBitCount = 24;
+
+    HBITMAP hInvBmp = ::GpiCreateBitmap(  hPSDst,
+                                          &vBmih,
+                                          0L,
+                                          NULL,
+                                          NULL  );
+
+    ::GpiSetBitmap(hPSSrc, (HBITMAP) hBmp);
+    ::GpiSetBitmap(hPSDst, (HBITMAP) hInvBmp);
+
+    ::GpiBitBlt(  hPSDst,
+                  hPSSrc,
+                  4L,
+                  vPoint,
+                  ROP_SRCCOPY,
+                  BBO_IGNORE  );
+
+    ::GpiDestroyPS(hPSSrc);
+    ::GpiDestroyPS(hPSDst);
+    ::DevCloseDC(hDCSrc);
+    ::DevCloseDC(hDCDst);
+
+    return hInvBmp;
+} // end of wxFlipBmp