X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34f0083726b6fd8d642df975e8999ca0dc8af903..9bc3af3e642709425476f6232a19fe4f1bbb42b8:/src/os2/bitmap.cpp

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index bdd712eeee..16373e6f32 100644
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -84,11 +84,7 @@ void wxBitmapRefData::Free()
             wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
         }
     }
-    if (m_pBitmapMask)
-    {
-        delete m_pBitmapMask;
-        m_pBitmapMask = NULL;
-    }
+    wxDELETE(m_pBitmapMask);
 } // end of wxBitmapRefData::Free
 
 // ----------------------------------------------------------------------------
@@ -97,7 +93,7 @@ void wxBitmapRefData::Free()
 
 wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
 {
-    return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
 }
 
 // this function should be called from all wxBitmap ctors
@@ -146,7 +142,7 @@ bool wxBitmap::CopyFromCursor(
 {
     UnRef();
 
-    if (!rCursor.Ok())
+    if (!rCursor.IsOk())
         return(false);
     return(CopyFromIconOrCursor(rCursor));
 } // end of wxBitmap::CopyFromCursor
@@ -157,7 +153,7 @@ bool wxBitmap::CopyFromIcon(
 {
     UnRef();
 
-    if (!rIcon.Ok())
+    if (!rIcon.IsOk())
         return(false);
 
     return CopyFromIconOrCursor(rIcon);
@@ -276,19 +272,6 @@ wxBitmap::wxBitmap(
     SetHBITMAP((WXHBITMAP)hBmp);
 } // end of wxBitmap::wxBitmap
 
-wxBitmap::wxBitmap(
-  int                               nW
-, int                               nH
-, int                               nD
-)
-{
-    Init();
-    (void)Create( nW
-                 ,nH
-                 ,nD
-                );
-} // end of wxBitmap::wxBitmap
-
 wxBitmap::wxBitmap(
   const void*                       pData
 , wxBitmapType                      lType
@@ -396,7 +379,7 @@ bool wxBitmap::Create(
     }
     SetHBITMAP((WXHBITMAP)hBmp);
 
-    return Ok();
+    return IsOk();
 } // end of wxBitmap::Create
 
 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
@@ -415,7 +398,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     else // no bitmap handler found
     {
         wxImage image;
-        if ( image.LoadFile( filename, type ) && image.Ok() )
+        if ( image.LoadFile( filename, type ) && image.IsOk() )
         {
             *this = wxBitmap(image);
 
@@ -510,7 +493,7 @@ bool wxBitmap::SaveFile(
         // FIXME what about palette? shouldn't we use it?
         wxImage                     vImage = ConvertToImage();
 
-        if (!vImage.Ok())
+        if (!vImage.IsOk())
             return false;
 
         return(vImage.SaveFile( rFilename
@@ -529,7 +512,7 @@ bool wxBitmap::CreateFromImage (
 , int                               nDepth
 )
 {
-    wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
+    wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image"));
     m_refData = new wxBitmapRefData();
 
     int                             nSizeLimit = 1024 * 768 * 3;
@@ -566,7 +549,7 @@ bool wxBitmap::CreateFromImage (
     //
     // Set bitmap parameters
     //
-    wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
+    wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image"));
     SetWidth(nWidth);
     SetHeight(nBmpHeight);
     if (nDepth == 1)
@@ -641,7 +624,7 @@ bool wxBitmap::CreateFromImage (
                             );
 #if wxUSE_PALETTE
     HPAL                            hOldPalette = NULLHANDLE;
-    if (rImage.GetPalette().Ok())
+    if (rImage.GetPalette().IsOk())
     {
         hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE());
     }
@@ -857,7 +840,7 @@ wxImage wxBitmap::ConvertToImage() const
     wxImage                         vImage;
     wxDC*                           pDC;
 
-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
 
     //
     // Create an wxImage object
@@ -930,7 +913,7 @@ wxImage wxBitmap::ConvertToImage() const
     // May already be selected into a PS
     //
     pDC = GetSelectedInto();
-    const wxPMDCImpl *impl; 
+    const wxPMDCImpl *impl;
     if (pDC != NULL &&
         (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
     {
@@ -1089,7 +1072,7 @@ wxBitmap wxBitmap::GetSubBitmap(
   const wxRect&                     rRect
 ) const
 {
-    wxCHECK_MSG( Ok() &&
+    wxCHECK_MSG( IsOk() &&
                  (rRect.x >= 0) && (rRect.y >= 0) &&
                  (rRect.x + rRect.width <= GetWidth()) &&
                  (rRect.y + rRect.height <= GetHeight()),
@@ -1099,7 +1082,7 @@ wxBitmap wxBitmap::GetSubBitmap(
                                          ,rRect.height
                                          ,GetDepth()
                                         );
-    wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") );
+    wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") );
 
 
     //
@@ -1285,7 +1268,7 @@ bool wxMask::Create(
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }
-    if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
+    if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1)
     {
         return false;
     }
@@ -1333,7 +1316,7 @@ bool wxMask::Create(
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }
-    if (rBitmap.Ok() && rBitmap.GetPalette()->Ok())
+    if (rBitmap.IsOk() && rBitmap.GetPalette()->IsOk())
     {
         unsigned char               cRed;
         unsigned char               cGreen;
@@ -1383,7 +1366,7 @@ bool wxMask::Create(
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }
-    if (!rBitmap.Ok())
+    if (!rBitmap.IsOk())
     {
         return false;
     }
@@ -1566,7 +1549,7 @@ HBITMAP wxInvertMask(
 {
     HBITMAP                         hBmpInvMask = 0;
 
-    wxCHECK_MSG( hBmpMask, 0, _T("invalid bitmap in wxInvertMask") );
+    wxCHECK_MSG( hBmpMask, 0, wxT("invalid bitmap in wxInvertMask") );
 
     //
     // Get width/height from the bitmap if not given
@@ -1628,7 +1611,7 @@ HBITMAP wxInvertMask(
 
 HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight )
 {
-    wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxCopyBmp") );
+    wxCHECK_MSG( hBmp, 0, wxT("invalid bitmap in wxCopyBmp") );
 
     //
     // Get width/height from the bitmap if not given