Use TranslateAccelerator so that TAB, Return, etc. keys are properly processed by...

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 7f972810481dbb84e13f6da6177bf5c2846e44b3..4f96446eef380ed48071e31e430974b412d6ddb8 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -9,10 +9,6 @@
 // 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"
 


@@ -65,13 +61,13 @@ void wxBitmapRefData::Free()
 {
     if ( m_pSelectedInto )
     {
 {
     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)


@@ -88,7 +84,7 @@ 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;
+    m_bIsMono = false;

     //
     // True for all bitmaps created from bits, wxImages, Xpms
     //
     //
     // True for all bitmaps created from bits, wxImages, Xpms
     //


@@ -104,7 +100,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 +120,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 +130,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 +141,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 +182,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 +190,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 +207,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 +238,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 +246,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);


@@ -334,7 +330,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 +365,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


@@ -393,27 +389,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(
   int                               nId
 , long                              lType
 )
 {
 bool wxBitmap::LoadFile(
   int                               nId
 , long                              lType
 )
 {

-    HPS                             hPs = NULLHANDLE;
-

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


@@ -433,7 +455,7 @@ bool wxBitmap::LoadFile(
     }
     else
     {
     }
     else
     {

-        return(FALSE);
+        return false;

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


@@ -453,10 +475,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;


@@ -494,7 +515,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


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


@@ -549,13 +570,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);


@@ -592,7 +613,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));
 


@@ -832,7 +853,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


@@ -859,12 +880,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


@@ -1048,11 +1068,11 @@ wxImage wxBitmap::ConvertToImage() const
                              ,ucGreen
                              ,ucBlue
                             );
                              ,ucGreen
                              ,ucBlue
                             );

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

     }
     else
     {
     }
     else
     {

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

     }
 
     //
     }
 
     //


@@ -1185,9 +1205,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


@@ -1265,7 +1283,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));


@@ -1296,7 +1314,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


@@ -1333,7 +1351,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


@@ -1343,7 +1361,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()


@@ -1355,9 +1373,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)
     {


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

-        return(FALSE);
+        return false;

     }
 
     //
     }
 
     //


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

-                bOk = FALSE;
+                bOk = false;

                 break;
             }
 
                 break;
             }
 


@@ -1429,32 +1444,30 @@ 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(
 }
 
 bool wxBitmapHandler::Load(


@@ -1474,7 +1487,7 @@ bool wxBitmapHandler::Load(
                               ,lFlags
                               ,nWidth
                               ,nHeight
                               ,lFlags
                               ,nWidth
                               ,nHeight

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

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


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

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

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


@@ -1502,7 +1515,7 @@ bool wxBitmapHandler::Create(
 , int                               WXUNUSED(nDepth)
 )
 {
 , int                               WXUNUSED(nDepth)
 )
 {

-    return(FALSE);
+    return false;

 }
 
 bool wxBitmapHandler::LoadFile(
 }
 
 bool wxBitmapHandler::LoadFile(


@@ -1513,7 +1526,18 @@ bool wxBitmapHandler::LoadFile(
 , int                               WXUNUSED(nDesiredHeight)
 )
 {
 , int                               WXUNUSED(nDesiredHeight)
 )
 {

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

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


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

-    return(FALSE);
+    return false;

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


@@ -1596,4 +1620,3 @@ HBITMAP wxInvertMask(
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask

-