Added ability to switch off more components of the size page UI

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 068ccb02949f490423707f51a30af82aef130d21..16373e6f32a07fb34dad65c732ce6854357b23d3 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -27,6 +27,7 @@
     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 

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

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


@@ -83,25 +84,16 @@ void wxBitmapRefData::Free()
             wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
         }
     }
             wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
         }
     }

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

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

-wxObjectRefData* wxBitmap::CreateRefData() const
-{
-    return new wxBitmapRefData;
-}
-
-wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
+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
 }
 
 // this function should be called from all wxBitmap ctors


@@ -150,7 +142,7 @@ bool wxBitmap::CopyFromCursor(
 {
     UnRef();
 
 {
     UnRef();
 

-    if (!rCursor.Ok())
+    if (!rCursor.IsOk())

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


@@ -161,7 +153,7 @@ bool wxBitmap::CopyFromIcon(
 {
     UnRef();
 
 {
     UnRef();
 

-    if (!rIcon.Ok())
+    if (!rIcon.IsOk())

         return(false);
 
     return CopyFromIconOrCursor(rIcon);
         return(false);
 
     return CopyFromIconOrCursor(rIcon);


@@ -280,22 +272,9 @@ wxBitmap::wxBitmap(
     SetHBITMAP((WXHBITMAP)hBmp);
 } // end of 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
 wxBitmap::wxBitmap(
   const void*                       pData

-, long                              lType
+, wxBitmapType                      lType

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


@@ -313,12 +292,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


@@ -400,10 +379,10 @@ bool wxBitmap::Create(
     }
     SetHBITMAP((WXHBITMAP)hBmp);
 
     }
     SetHBITMAP((WXHBITMAP)hBmp);
 

-    return Ok();
+    return IsOk();

 } // end of wxBitmap::Create
 
 } // end of wxBitmap::Create
 

-bool wxBitmap::LoadFile(const wxString& filename, long type)
+bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -419,7 +398,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
     else // no bitmap handler found
     {
         wxImage image;
     else // no bitmap handler found
     {
         wxImage image;

-        if ( image.LoadFile( filename, type ) && image.Ok() )
+        if ( image.LoadFile( filename, type ) && image.IsOk() )

         {
             *this = wxBitmap(image);
 
         {
             *this = wxBitmap(image);
 


@@ -433,7 +412,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
 
 bool wxBitmap::LoadFile(
   int                               nId
 
 bool wxBitmap::LoadFile(
   int                               nId

-, long                              lType
+, wxBitmapType                      lType

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


@@ -461,7 +440,7 @@ bool wxBitmap::LoadFile(
 
 bool wxBitmap::Create(
   const void*                       pData
 
 bool wxBitmap::Create(
   const void*                       pData

-, long                              lType
+, wxBitmapType                      lType

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


@@ -493,7 +472,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
 )
 {


@@ -514,7 +493,7 @@ bool wxBitmap::SaveFile(
         // FIXME what about palette? shouldn't we use it?
         wxImage                     vImage = ConvertToImage();
 
         // FIXME what about palette? shouldn't we use it?
         wxImage                     vImage = ConvertToImage();
 

-        if (!vImage.Ok())
+        if (!vImage.IsOk())

             return false;
 
         return(vImage.SaveFile( rFilename
             return false;
 
         return(vImage.SaveFile( rFilename


@@ -533,7 +512,7 @@ bool wxBitmap::CreateFromImage (
 , int                               nDepth
 )
 {
 , 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;
     m_refData = new wxBitmapRefData();
 
     int                             nSizeLimit = 1024 * 768 * 3;


@@ -570,7 +549,7 @@ bool wxBitmap::CreateFromImage (
     //
     // Set bitmap parameters
     //
     //
     // 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)
     SetWidth(nWidth);
     SetHeight(nBmpHeight);
     if (nDepth == 1)


@@ -645,7 +624,7 @@ bool wxBitmap::CreateFromImage (
                             );
 #if wxUSE_PALETTE
     HPAL                            hOldPalette = NULLHANDLE;
                             );
 #if wxUSE_PALETTE
     HPAL                            hOldPalette = NULLHANDLE;

-    if (rImage.GetPalette().Ok())
+    if (rImage.GetPalette().IsOk())

     {
         hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE());
     }
     {
         hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE());
     }


@@ -861,7 +840,7 @@ wxImage wxBitmap::ConvertToImage() const
     wxImage                         vImage;
     wxDC*                           pDC;
 
     wxImage                         vImage;
     wxDC*                           pDC;
 

-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );

 
     //
     // Create an wxImage object
 
     //
     // Create an wxImage object


@@ -933,9 +912,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
     {


@@ -1090,7 +1072,7 @@ wxBitmap wxBitmap::GetSubBitmap(
   const wxRect&                     rRect
 ) const
 {
   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()),
                  (rRect.x >= 0) && (rRect.y >= 0) &&
                  (rRect.x + rRect.width <= GetWidth()) &&
                  (rRect.y + rRect.height <= GetHeight()),


@@ -1100,7 +1082,7 @@ wxBitmap wxBitmap::GetSubBitmap(
                                          ,rRect.height
                                          ,GetDepth()
                                         );
                                          ,rRect.height
                                          ,GetDepth()
                                         );

-    wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") );
+    wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") );

 
 
     //
 
 
     //


@@ -1286,7 +1268,7 @@ bool wxMask::Create(
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }

-    if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
+    if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1)

     {
         return false;
     }
     {
         return false;
     }


@@ -1334,7 +1316,7 @@ bool wxMask::Create(
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }
         ::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;
     {
         unsigned char               cRed;
         unsigned char               cGreen;


@@ -1384,7 +1366,7 @@ bool wxMask::Create(
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }
         ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
         m_hMaskBitmap = 0;
     }

-    if (!rBitmap.Ok())
+    if (!rBitmap.IsOk())

     {
         return false;
     }
     {
         return false;
     }


@@ -1458,7 +1440,7 @@ bool wxMask::Create(
 
 bool wxBitmapHandler::Create( wxGDIImage* pImage,
                               const void* pData,
 
 bool wxBitmapHandler::Create( wxGDIImage* pImage,
                               const void* pData,

-                              long        WXUNUSED(lFlags),
+                              wxBitmapType lType,

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


@@ -1469,6 +1451,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage,
 
     return(pBitmap ? Create( pBitmap
                             ,pData
 
     return(pBitmap ? Create( pBitmap
                             ,pData

+                            ,lType

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


@@ -1478,7 +1461,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage,
 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
 )


@@ -1496,10 +1479,10 @@ bool wxBitmapHandler::Load(
 }
 
 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


@@ -1514,7 +1497,7 @@ bool wxBitmapHandler::Save(
 bool wxBitmapHandler::Create(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const void*                       WXUNUSED(pData)
 bool wxBitmapHandler::Create(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const void*                       WXUNUSED(pData)

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

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


@@ -1526,7 +1509,7 @@ bool wxBitmapHandler::Create(
 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)
 )


@@ -1537,7 +1520,7 @@ bool wxBitmapHandler::LoadFile(
 bool wxBitmapHandler::LoadFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const wxString&                   WXUNUSED(rName)
 bool wxBitmapHandler::LoadFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const wxString&                   WXUNUSED(rName)

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

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


@@ -1548,9 +1531,9 @@ bool wxBitmapHandler::LoadFile(
 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;
 }


@@ -1566,7 +1549,7 @@ HBITMAP wxInvertMask(
 {
     HBITMAP                         hBmpInvMask = 0;
 
 {
     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
 
     //
     // 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 )
 {
 
 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
 
     //
     // Get width/height from the bitmap if not given