Don't close arcs drawn in wxPostScriptDC.

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 6c4cb2fd22ba6ba52829761bc4fc44bbf7827c7a..74c400fcccbebe46dbff89ec8438a0d53e0ea4bd 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -24,11 +24,12 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"

+    #include "wx/image.h"

 #endif
 
 #endif
 

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

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

-#include "wx/image.h"

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


@@ -57,6 +58,19 @@ wxBitmapRefData::wxBitmapRefData()
     m_hBitmap       = (WXHBITMAP) NULL;
 } // end of wxBitmapRefData::wxBitmapRefData
 
     m_hBitmap       = (WXHBITMAP) NULL;
 } // end of wxBitmapRefData::wxBitmapRefData
 

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

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


@@ -70,17 +84,18 @@ 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
 // ----------------------------------------------------------------------------
 

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

 // this function should be called from all wxBitmap ctors
 void wxBitmap::Init()
 {
 // this function should be called from all wxBitmap ctors
 void wxBitmap::Init()
 {


@@ -258,21 +273,8 @@ wxBitmap::wxBitmap(
 } // end of wxBitmap::wxBitmap
 
 wxBitmap::wxBitmap(
 } // end of wxBitmap::wxBitmap
 
 wxBitmap::wxBitmap(

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

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


@@ -290,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


@@ -380,28 +382,7 @@ bool wxBitmap::Create(
     return Ok();
 } // end of wxBitmap::Create
 
     return Ok();
 } // end of wxBitmap::Create
 

-bool wxBitmap::CreateFromXpm(
-  const char**                      ppData
-)
-{
-#if wxUSE_IMAGE && wxUSE_XPM
-    Init();
-
-    wxCHECK_MSG(ppData != NULL, false, wxT("invalid bitmap data"));
-
-    wxXPMDecoder                    vDecoder;
-    wxImage                         vImg = vDecoder.ReadData(ppData);
-
-    wxCHECK_MSG(vImg.Ok(), false, wxT("invalid bitmap data"));
-
-    *this = wxBitmap(vImg);
-    return true;
-#else
-    return false;
-#endif
-} // end of wxBitmap::CreateFromXpm
-
-bool wxBitmap::LoadFile(const wxString& filename, long type)
+bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -431,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();


@@ -458,8 +439,8 @@ bool wxBitmap::LoadFile(
 } // end of wxBitmap::LoadFile
 
 bool wxBitmap::Create(
 } // end of wxBitmap::LoadFile
 
 bool wxBitmap::Create(

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

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


@@ -491,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
 )
 {


@@ -931,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
     {


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

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

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


@@ -1450,8 +1439,8 @@ bool wxMask::Create(
 // ----------------------------------------------------------------------------
 
 bool wxBitmapHandler::Create( wxGDIImage* pImage,
 // ----------------------------------------------------------------------------
 
 bool wxBitmapHandler::Create( wxGDIImage* pImage,

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

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


@@ -1462,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


@@ -1471,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
 )


@@ -1489,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


@@ -1506,8 +1496,8 @@ bool wxBitmapHandler::Save(
 
 bool wxBitmapHandler::Create(
   wxBitmap*                         WXUNUSED(pBitmap)
 
 bool wxBitmapHandler::Create(
   wxBitmap*                         WXUNUSED(pBitmap)

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

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


@@ -1519,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)
 )


@@ -1530,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)
 )


@@ -1541,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;
 }


@@ -1559,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


@@ -1619,9 +1609,9 @@ HBITMAP wxInvertMask(
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 

-HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
+HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight )

 {
 {

-    wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxFlipBmp") );
+    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


@@ -1664,7 +1654,11 @@ HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
                                     {nWidth, 0},
                                     {0,      0},
                                     {nWidth, nHeight} };
                                     {nWidth, 0},
                                     {0,      0},
                                     {nWidth, nHeight} };

-
+    if (!flip)
+    {
+        vPoint[0].y = 0;
+        vPoint[1].y = nHeight;
+    }

     memset(&vBmih, '\0', 16);
     vBmih.cbFix     = 16;
     vBmih.cx        = nWidth;
     memset(&vBmih, '\0', 16);
     vBmih.cbFix     = 16;
     vBmih.cx        = nWidth;