Fixes for the DLL build

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 94dcdeaa5dcd639db34311b0ba1f6f58140cb617..6c4cb2fd22ba6ba52829761bc4fc44bbf7827c7a 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,14 +22,12 @@
     #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"

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

-#include "wx/log.h"

 
 

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

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


@@ -58,25 +54,27 @@ wxBitmapRefData::wxBitmapRefData()
     m_pSelectedInto = NULL;
     m_nNumColors    = 0;
     m_pBitmapMask   = NULL;
     m_pSelectedInto = NULL;
     m_nNumColors    = 0;
     m_pBitmapMask   = NULL;

-    m_hBitmap = (WXHBITMAP) NULL;
+    m_hBitmap       = (WXHBITMAP) NULL;

 } // end of wxBitmapRefData::wxBitmapRefData
 
 void wxBitmapRefData::Free()
 {
     if ( m_pSelectedInto )
     {
 } // end of wxBitmapRefData::wxBitmapRefData
 
 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)"));

         }
     }
         }
     }

-
-    delete m_pBitmapMask;
-    m_pBitmapMask = NULL;
+    if (m_pBitmapMask)
+    {
+        delete m_pBitmapMask;
+        m_pBitmapMask = NULL;
+    }

 } // end of wxBitmapRefData::Free
 
 // ----------------------------------------------------------------------------
 } // end of wxBitmapRefData::Free
 
 // ----------------------------------------------------------------------------


@@ -86,11 +84,13 @@ 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_bIsMono = false;
+    //
+    // True for all bitmaps created from bits, wxImages, Xpms
+    //

 } // end of wxBitmap::Init
 
 } // 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;


@@ -98,7 +98,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;
 


@@ -113,10 +113,12 @@ bool wxBitmap::CopyFromIconOrCursor(
 
     pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor;
 
 
     pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor;
 

-    //
-    // No mask in the Info struct in OS/2
-    //
-    return(TRUE);
+    wxMask*                         pMask = new wxMask(SIconInfo.hbmPointer);
+
+    pMask->SetMaskBitmap(GetHBITMAP());
+    SetMask(pMask);
+
+    return true;

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


@@ -126,7 +128,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
 


@@ -137,7 +139,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


@@ -178,7 +180,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)


@@ -186,7 +188,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;


@@ -203,14 +205,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;


@@ -234,7 +236,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);


@@ -242,13 +244,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);


@@ -262,7 +264,6 @@ wxBitmap::wxBitmap(
 )
 {
     Init();
 )
 {
     Init();

-

     (void)Create( nW
                  ,nH
                  ,nD
     (void)Create( nW
                  ,nH
                  ,nD


@@ -288,15 +289,15 @@ wxBitmap::wxBitmap(
 } // end of wxBitmap::wxBitmap
 
 wxBitmap::wxBitmap(
 } // end of wxBitmap::wxBitmap
 
 wxBitmap::wxBitmap(

-  const wxString&                   rFilename
+  int                               nId

 , long                              lType
 )
 {
     Init();
 , long                              lType
 )
 {
     Init();

-
-    LoadFile( rFilename
+    LoadFile( nId

              ,(int)lType
             );
              ,(int)lType
             );

+    SetId(nId);

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


@@ -315,6 +316,10 @@ bool wxBitmap::Create(
     GetBitmapData()->m_nHeight = nH;
     GetBitmapData()->m_nDepth = nD;
 
     GetBitmapData()->m_nHeight = nH;
     GetBitmapData()->m_nDepth = nD;
 

+    //
+    // Xpms and bitmaps from other images can also be mono's, but only
+    // mono's need help changing their colors with MemDC changes
+    //

     if (nD > 0)
     {
         DEVOPENSTRUC                vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     if (nD > 0)
     {
         DEVOPENSTRUC                vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};


@@ -322,12 +327,14 @@ bool wxBitmap::Create(
         HDC                         hDC   = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
         HPS                         hPS   = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
 
         HDC                         hDC   = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
         HPS                         hPS   = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
 

+        if (nD == 1)
+            m_bIsMono = true;

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

-        vHeader.cBitCount = nD;
+        vHeader.cBitCount = 24; //nD;

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


@@ -356,7 +363,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


@@ -370,10 +377,6 @@ bool wxBitmap::Create(
     }
     SetHBITMAP((WXHBITMAP)hBmp);
 
     }
     SetHBITMAP((WXHBITMAP)hBmp);
 

-#if WXWIN_COMPATIBILITY_2
-    GetBitmapData()->m_bOk = hBmp != 0;
-#endif // WXWIN_COMPATIBILITY_2
-

     return Ok();
 } // end of wxBitmap::Create
 
     return Ok();
 } // end of wxBitmap::Create
 


@@ -384,27 +387,53 @@ bool wxBitmap::CreateFromXpm(
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 

-    wxCHECK_MSG(ppData != NULL, FALSE, wxT("invalid bitmap data"))
+    wxCHECK_MSG(ppData != NULL, false, wxT("invalid bitmap data"));

 
     wxXPMDecoder                    vDecoder;
     wxImage                         vImg = vDecoder.ReadData(ppData);
 
 
     wxXPMDecoder                    vDecoder;
     wxImage                         vImg = vDecoder.ReadData(ppData);
 

-    wxCHECK_MSG(vImg.Ok(), FALSE, wxT("invalid bitmap data"))
+    wxCHECK_MSG(vImg.Ok(), false, wxT("invalid bitmap data"));

 
     *this = wxBitmap(vImg);
 
     *this = wxBitmap(vImg);

-    return TRUE;
+    return true;

 #else
 #else

-    return FALSE;
+    return false;

 #endif
 } // end of wxBitmap::CreateFromXpm
 
 #endif
 } // end of wxBitmap::CreateFromXpm
 

+bool wxBitmap::LoadFile(const wxString& filename, long type)
+{
+    UnRef();
+
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+    if ( handler )
+    {
+        m_refData = new wxBitmapRefData;
+
+        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);
+
+            return true;
+        }
+    }
+#endif // wxUSE_IMAGE
+
+    return false;
+}
+

 bool wxBitmap::LoadFile(
 bool wxBitmap::LoadFile(

-  const wxString&                   rFilename
+  int                               nId

 , long                              lType
 )
 {
 , long                              lType
 )
 {

-    HPS                             hPs = NULLHANDLE;
-

     UnRef();
 
     wxBitmapHandler*                pHandler = wxDynamicCast( FindHandler(lType)
     UnRef();
 
     wxBitmapHandler*                pHandler = wxDynamicCast( FindHandler(lType)


@@ -416,8 +445,7 @@ bool wxBitmap::LoadFile(
         m_refData = new wxBitmapRefData;
 
         return(pHandler->LoadFile( this
         m_refData = new wxBitmapRefData;
 
         return(pHandler->LoadFile( this

-                                  ,rFilename
-                                  ,hPs
+                                  ,nId

                                   ,lType
                                   , -1
                                   , -1
                                   ,lType
                                   , -1
                                   , -1


@@ -425,14 +453,7 @@ bool wxBitmap::LoadFile(
     }
     else
     {
     }
     else
     {

-        wxImage                     vImage;
-
-        if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() )
-            return(FALSE);
-
-        *this = wxBitmap(vImage);
-
-        return(TRUE);
+        return false;

     }
 } // end of wxBitmap::LoadFile
 
     }
 } // end of wxBitmap::LoadFile
 


@@ -452,10 +473,9 @@ bool wxBitmap::Create(
 
     if (!pHandler)
     {
 
     if (!pHandler)
     {

-        wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for "
-                       "type %d 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;


@@ -493,7 +513,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


@@ -503,7 +523,7 @@ bool wxBitmap::SaveFile(
 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------

-// wxImage-wxBitmap convertion
+// wxImage-wxBitmap conversion

 // ----------------------------------------------------------------------------
 
 bool wxBitmap::CreateFromImage (
 // ----------------------------------------------------------------------------
 
 bool wxBitmap::CreateFromImage (


@@ -511,10 +531,9 @@ 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();
 
     m_refData = new wxBitmapRefData();
 

-

     int                             nSizeLimit = 1024 * 768 * 3;
     int                             nWidth = rImage.GetWidth();
     int                             nBmpHeight = rImage.GetHeight();
     int                             nSizeLimit = 1024 * 768 * 3;
     int                             nWidth = rImage.GetWidth();
     int                             nBmpHeight = rImage.GetHeight();


@@ -549,9 +568,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);
     SetWidth(nWidth);
     SetHeight(nBmpHeight);

+    if (nDepth == 1)
+        m_bIsMono = true;
+    else
+        m_bIsMono = false;

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


@@ -588,7 +611,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));
 


@@ -618,7 +641,6 @@ bool wxBitmap::CreateFromImage (
                              ,NULL
                              ,NULL
                             );
                              ,NULL
                              ,NULL
                             );

-    hBmpOld = ::GpiSetBitmap(hPS, hBmp);

 #if wxUSE_PALETTE
     HPAL                            hOldPalette = NULLHANDLE;
     if (rImage.GetPalette().Ok())
 #if wxUSE_PALETTE
     HPAL                            hOldPalette = NULLHANDLE;
     if (rImage.GetPalette().Ok())


@@ -638,6 +660,14 @@ bool wxBitmap::CreateFromImage (
     unsigned char*                  ptdata = pData;
     unsigned char*                  ptbits;
 
     unsigned char*                  ptdata = pData;
     unsigned char*                  ptbits;
 

+    if ((hBmpOld = ::GpiSetBitmap(hPS, hBmp)) == HBM_ERROR)
+    {
+        ERRORID                 vError;
+        wxString                sError;
+
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+    }

     for (n = 0; n < nNumDIB; n++)
     {
         if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0)
     for (n = 0; n < nNumDIB; n++)
     {
         if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0)


@@ -681,19 +711,15 @@ bool wxBitmap::CreateFromImage (
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         }
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         }

-        //
-        // Debug stuff
-        //
-

         hPSScreen = ::GpiCreatePS( vHabmain
                                   ,hDCScreen
                                   ,&vSize
                                   ,PU_PELS | GPIA_ASSOC
                                  );
 
         hPSScreen = ::GpiCreatePS( vHabmain
                                   ,hDCScreen
                                   ,&vSize
                                   ,PU_PELS | GPIA_ASSOC
                                  );
 

-        POINTL                      vPoint[4] = { 0, nOrigin,
-                                                  nWidth, nHeight,
-                                                  0, 0, nWidth, nHeight
+        POINTL                      vPoint[4] = { {0, nOrigin},
+                                                  {nWidth, nHeight},
+                                                  {0, 0}, {nWidth, nHeight}

                                                 };
 
 
                                                 };
 
 


@@ -754,13 +780,18 @@ bool wxBitmap::CreateFromImage (
                 //
                 nHeight         = nHRemain;
                 vHeader.cy      = (DWORD)(nHeight);
                 //
                 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++)
                 {
             }
             ptbits = pucBits;
             for (int j = 0; j < nHeight; j++)
             {
                 for (i = 0; i < nWidth; i++)
                 {

-                    if ((*(ptdata++) != cRed) || (*(ptdata++) != cGreen) || (*(ptdata++) != cBlue))
+                    unsigned char cRedImage   = (*(ptdata++)) ;
+                    unsigned char cGreenImage = (*(ptdata++)) ;
+                    unsigned char cBlueImage  = (*(ptdata++)) ;
+
+                    if ((cRedImage != cRed) || (cGreenImage != cGreen) || (cBlueImage != cBlue))

                     {
                         *(ptbits++) = cOne;
                         *(ptbits++) = cOne;
                     {
                         *(ptbits++) = cOne;
                         *(ptbits++) = cOne;


@@ -787,9 +818,9 @@ bool wxBitmap::CreateFromImage (
                                       ,&vSize
                                       ,PU_PELS | GPIA_ASSOC
                                      );
                                       ,&vSize
                                       ,PU_PELS | GPIA_ASSOC
                                      );

-            POINTL vPoint2[4] = { 0, nOrigin,
-                                  nWidth, nHeight,
-                                  0, 0, nWidth, nHeight
+            POINTL vPoint2[4] = { {0, nOrigin},
+                                  {nWidth, nHeight},
+                                  {0, 0}, {nWidth, nHeight}

                                 };
             ::GpiBitBlt( hPSScreen
                         ,hPS
                                 };
             ::GpiBitBlt( hPSScreen
                         ,hPS


@@ -820,7 +851,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


@@ -847,12 +878,11 @@ wxImage wxBitmap::ConvertToImage() const
     BITMAPINFOHEADER2               vDIBh;
     BITMAPINFO2                     vDIBInfo;
     HPS                             hPSMem;
     BITMAPINFOHEADER2               vDIBh;
     BITMAPINFO2                     vDIBInfo;
     HPS                             hPSMem;

-    HPS                             hPS;

     HBITMAP                         hBitmap;
     HBITMAP                         hOldBitmap;
     DEVOPENSTRUC                    vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     SIZEL                           vSizlPage = {0,0};
     HBITMAP                         hBitmap;
     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


@@ -919,14 +949,14 @@ wxImage wxBitmap::ConvertToImage() const
                                ,&vSizlPage
                                ,PU_PELS | GPIA_ASSOC
                               );
                                ,&vSizlPage
                                ,PU_PELS | GPIA_ASSOC
                               );

-        if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR)
-        {
-            ERRORID                 vError;
-            wxString                sError;
+    }
+    if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR)
+    {
+        ERRORID                 vError;
+        wxString                sError;

 
 

-            vError = ::WinGetLastError(vHabmain);
-            sError = wxPMErrorToStr(vError);
-        }
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);

     }
 
     //
     }
 
     //


@@ -1036,11 +1066,11 @@ wxImage wxBitmap::ConvertToImage() const
                              ,ucGreen
                              ,ucBlue
                             );
                              ,ucGreen
                              ,ucBlue
                             );

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

     }
     else
     {
     }
     else
     {

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

     }
 
     //
     }
 
     //


@@ -1080,9 +1110,9 @@ wxBitmap wxBitmap::GetSubBitmap(
     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);
     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, rRect.width, rRect.height,
-                                                  rRect.x, rRect.y,
-                                                  rRect.x + rRect.width, rRect.y + rRect.height
+    POINTL                          vPoint[4] = { {0, 0}, {rRect.width, rRect.height},
+                                                  {rRect.x, rRect.y},
+                                                  {rRect.x + rRect.width, rRect.y + rRect.height}

                                                 };
 
     ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());
                                                 };
 
     ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());


@@ -1107,7 +1137,7 @@ wxBitmap wxBitmap::GetSubBitmap(
         vBmih.cx        = rRect.width;
         vBmih.cy        = rRect.height;
         vBmih.cPlanes   = 1;
         vBmih.cx        = rRect.width;
         vBmih.cy        = rRect.height;
         vBmih.cPlanes   = 1;

-        vBmih.cBitCount = 1;
+        vBmih.cBitCount = 24;

 
         HBITMAP                     hBmpMask = ::GpiCreateBitmap( hPSDst
                                                                  ,&vBmih
 
         HBITMAP                     hBmpMask = ::GpiCreateBitmap( hPSDst
                                                                  ,&vBmih


@@ -1155,17 +1185,6 @@ void wxBitmap::SetQuality(
     GetBitmapData()->m_nQuality = nQ;
 } // end of wxBitmap::SetQuality
 
     GetBitmapData()->m_nQuality = nQ;
 } // end of wxBitmap::SetQuality
 

-#if WXWIN_COMPATIBILITY_2
-void wxBitmap::SetOk(
-  bool                              bOk
-)
-{
-    EnsureHasData();
-
-    GetBitmapData()->m_bOk = bOk;
-} // end of wxBitmap::SetOk
-#endif // WXWIN_COMPATIBILITY_2
-

 void wxBitmap::SetPalette(
   const wxPalette&                  rPalette
 )
 void wxBitmap::SetPalette(
   const wxPalette&                  rPalette
 )


@@ -1184,9 +1203,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


@@ -1253,8 +1270,8 @@ bool wxMask::Create(
     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);
     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, rBitmap.GetWidth(), rBitmap.GetHeight(),
-                                                  0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
+    POINTL                          vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()},
+                                                  {0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}

                                                 };
 
     if (m_hMaskBitmap)
                                                 };
 
     if (m_hMaskBitmap)


@@ -1264,7 +1281,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));


@@ -1272,7 +1289,7 @@ bool wxMask::Create(
     vBmih.cx        = rBitmap.GetWidth();
     vBmih.cy        = rBitmap.GetHeight();
     vBmih.cPlanes   = 1;
     vBmih.cx        = rBitmap.GetWidth();
     vBmih.cy        = rBitmap.GetHeight();
     vBmih.cPlanes   = 1;

-    vBmih.cBitCount = 1;
+    vBmih.cBitCount = 24;

 
     m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
                                       ,&vBmih
 
     m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
                                       ,&vBmih


@@ -1295,7 +1312,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


@@ -1332,7 +1349,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


@@ -1342,7 +1359,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()


@@ -1354,9 +1371,6 @@ bool wxMask::Create(
     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);
     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, rBitmap.GetWidth(), rBitmap.GetHeight(),
-                                                  0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
-                                                };

 
     if (m_hMaskBitmap)
     {
 
     if (m_hMaskBitmap)
     {


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

-        return(FALSE);
+        return false;

     }
 
     //
     }
 
     //


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

-                bOk = FALSE;
+                bOk = false;

                 break;
             }
 
                 break;
             }
 


@@ -1428,38 +1442,35 @@ 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,
+                              void*       pData,
+                              long        WXUNUSED(lFlags),
+                              int         nWidth,
+                              int         nHeight,
+                              int         nDepth)

 {
 {

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

 
     return(pBitmap ? Create( pBitmap
                             ,pData
                             ,nWidth
                             ,nHeight
                             ,nDepth
 
     return(pBitmap ? Create( pBitmap
                             ,pData
                             ,nWidth
                             ,nHeight
                             ,nDepth

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

 }
 
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 }
 
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage

-, const wxString&                   rName
-, HPS                               hPs
+, int                               nId

 , long                              lFlags
 , int                               nWidth
 , int                               nHeight
 , long                              lFlags
 , int                               nWidth
 , int                               nHeight


@@ -1470,12 +1481,11 @@ bool wxBitmapHandler::Load(
                                                            );
 
     return(pBitmap ? LoadFile( pBitmap
                                                            );
 
     return(pBitmap ? LoadFile( pBitmap

-                              ,rName
-                              ,hPs
+                              ,nId

                               ,lFlags
                               ,nWidth
                               ,nHeight
                               ,lFlags
                               ,nWidth
                               ,nHeight

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

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


@@ -1491,7 +1501,7 @@ bool wxBitmapHandler::Save(
     return(pBitmap ? SaveFile( pBitmap
                               ,rName
                               ,lType
     return(pBitmap ? SaveFile( pBitmap
                               ,rName
                               ,lType

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

 }
 
 bool wxBitmapHandler::Create(
 }
 
 bool wxBitmapHandler::Create(


@@ -1503,19 +1513,29 @@ bool wxBitmapHandler::Create(
 , int                               WXUNUSED(nDepth)
 )
 {
 , int                               WXUNUSED(nDepth)
 )
 {

-    return(FALSE);
+    return false;
+}
+
+bool wxBitmapHandler::LoadFile(
+  wxBitmap*                         WXUNUSED(pBitmap)
+, int                               WXUNUSED(nId)
+, long                              WXUNUSED(lType)
+, int                               WXUNUSED(nDesiredWidth)
+, int                               WXUNUSED(nDesiredHeight)
+)
+{
+    return false;

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

-, HPS                               WXUNUSED(hPs)

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

-    return(FALSE);
+    return false;

 }
 
 bool wxBitmapHandler::SaveFile(
 }
 
 bool wxBitmapHandler::SaveFile(


@@ -1525,7 +1545,7 @@ bool wxBitmapHandler::SaveFile(
 , const wxPalette*                  WXUNUSED(pPalette)
 )
 {
 , const wxPalette*                  WXUNUSED(pPalette)
 )
 {

-    return(FALSE);
+    return false;

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


@@ -1562,16 +1582,16 @@ HBITMAP wxInvertMask(
     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);
     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
+    POINTL                          vPoint[4] = { {0 ,0}, {nWidth, nHeight},
+                                                  {0, 0}, {nWidth, nHeight}

                                                 };
 
                                                 };
 

-    memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
-    vBmih.cbFix     =  sizeof(BITMAPINFOHEADER2);
+    memset(&vBmih, '\0', 16);
+    vBmih.cbFix     = 16;

     vBmih.cx        = nWidth;
     vBmih.cy        = nHeight;
     vBmih.cPlanes   = 1;
     vBmih.cx        = nWidth;
     vBmih.cy        = nHeight;
     vBmih.cPlanes   = 1;

-    vBmih.cBitCount = 1;
+    vBmih.cBitCount = 24;

 
     hBmpInvMask = ::GpiCreateBitmap( hPSDst
                                     ,&vBmih
 
     hBmpInvMask = ::GpiCreateBitmap( hPSDst
                                     ,&vBmih


@@ -1599,3 +1619,79 @@ HBITMAP wxInvertMask(
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 

+HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
+{
+    wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxFlipBmp") );
+
+    //
+    // 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} };
+
+    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