Cast needed to fix compilation on 10.4 --This line, and those below,

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index e0a572c251514416b2c743d6740ae5438720cfdb..d4d5ec937cb7321b0db4d1a9d577543ea486c539 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/os2/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:


@@ -12,37 +12,48 @@
 // 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/dcmemory.h"
+#include "wx/os2/dcmemory.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/log.h"

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

-#include "wx/dcmemory.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl)

 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 

-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+        : wxPMDCImpl( owner )

 {
 {

-    CreateCompatible(NULL);
-    Init();
-} // end of wxMemoryDC::wxMemoryDC
-
-wxMemoryDC::wxMemoryDC(
-  wxDC*                             pOldDC
-)
+    CreateCompatible(NULL); 
+    Init(); 
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) 
+        : wxPMDCImpl( owner ) 
+{ 
+    CreateCompatible(NULL); 
+    Init(); 
+    DoSelect(bitmap);
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)
+        : wxPMDCImpl( owner ) 

 {
 {

-    pOldDC->BeginDrawing();
+    wxCHECK_RET( pOldDC, _T("NULL dc in wxMemoryDC ctor") );
+

     CreateCompatible(pOldDC);
     CreateCompatible(pOldDC);

-    pOldDC->EndDrawing();

     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 

-void wxMemoryDC::Init()
+void wxMemoryDCImpl::Init()

 {
     if (m_ok)
     {
 {
     if (m_ok)
     {


@@ -53,16 +64,15 @@ void wxMemoryDC::Init()
         // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
         ::GpiSetBackMix( GetHPS(), BM_LEAVEALONE );
     }
         // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
         ::GpiSetBackMix( GetHPS(), BM_LEAVEALONE );
     }

+    memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));

 } // end of wxMemoryDC::Init
 
 } // end of wxMemoryDC::Init
 

-bool wxMemoryDC::CreateCompatible(
-  wxDC*                             pDC
-)
+bool wxMemoryDCImpl::CreateCompatible( wxDC* WXUNUSED(pDC) )

 {
 {

-    HDC                             hDC;
-    HPS                             hPS;
-    DEVOPENSTRUC                    vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
-    SIZEL                           vSize = {0, 0};
+    HDC           hDC;
+    HPS           hPS;
+    DEVOPENSTRUC  vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+    SIZEL         vSize = {0, 0};

 
     //
     // Create a memory device context
 
     //
     // Create a memory device context


@@ -75,10 +85,10 @@ bool wxMemoryDC::CreateCompatible(
         {
             m_hPS = hPS;
             m_hDC = hDC;
         {
             m_hPS = hPS;
             m_hDC = hDC;

-            m_ok = TRUE;
-            m_bOwnsDC = TRUE;
+            m_ok = true;
+            m_bOwnsDC = true;

             //
             //

-            // Set the wxWindows color table
+            // Set the wxWidgets color table

             //
             ::GpiCreateLogColorTable( m_hPS
                                      ,0L
             //
             ::GpiCreateLogColorTable( m_hPS
                                      ,0L


@@ -99,27 +109,27 @@ bool wxMemoryDC::CreateCompatible(
         {
             m_hPS = NULLHANDLE;
             m_hDC = NULLHANDLE;
         {
             m_hPS = NULLHANDLE;
             m_hDC = NULLHANDLE;

-            m_ok  = FALSE;
-            m_bOwnsDC = FALSE;
+            m_ok  = false;
+            m_bOwnsDC = false;

         }
     }
     else
     {
         m_hPS = NULLHANDLE;
         m_hDC = NULLHANDLE;
         }
     }
     else
     {
         m_hPS = NULLHANDLE;
         m_hDC = NULLHANDLE;

-        m_ok  = FALSE;
-        m_bOwnsDC = FALSE;
+        m_ok  = false;
+        m_bOwnsDC = false;

     }
 
     //
     // As we created the DC, we must delete it in the dtor
     //
     }
 
     //
     // As we created the DC, we must delete it in the dtor
     //

-    m_bOwnsDC = TRUE;
+    m_bOwnsDC = true;

     m_ok = m_hDC != 0;
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 
     m_ok = m_hDC != 0;
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 

-void wxMemoryDC::SelectObject(
+void wxMemoryDCImpl::DoSelect(

   const wxBitmap&                   rBitmap
 )
 {
   const wxBitmap&                   rBitmap
 )
 {


@@ -140,31 +150,53 @@ void wxMemoryDC::SelectObject(
     // Check for whether the bitmap is already selected into a device context
     //
     wxCHECK_RET( !rBitmap.GetSelectedInto() ||
     // Check for whether the bitmap is already selected into a device context
     //
     wxCHECK_RET( !rBitmap.GetSelectedInto() ||

-                 (rBitmap.GetSelectedInto() == this),
+                 (rBitmap.GetSelectedInto() == GetOwner()),

                  wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
                  wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 

+    WXHBITMAP                       hBmp = rBitmap.GetHBITMAP();
+
+    if (!hBmp)
+    {
+        //
+        // Bmps drawn to are upside down, so flip it before committing
+        //
+        POINTL                      vPoint[4] = { {0, m_vSelectedBitmap.GetHeight()}
+                                                 ,{m_vSelectedBitmap.GetWidth(), 0}
+                                                 ,{0, 0}
+                                                 ,{m_vSelectedBitmap.GetWidth(), m_vSelectedBitmap.GetHeight()}
+                                                };
+
+
+        ::GpiBitBlt( m_hPS
+                    ,m_hPS
+                    ,4
+                    ,vPoint
+                    ,ROP_SRCCOPY
+                    ,BBO_IGNORE
+                   );
+        m_vSelectedBitmap.SetSelectedInto(NULL);
+    }
+

     m_vSelectedBitmap = rBitmap;
 
     m_vSelectedBitmap = rBitmap;
 

-    WXHBITMAP                       hBmp = m_vSelectedBitmap.GetHBITMAP();

 
     if (!hBmp)
 
     if (!hBmp)

-        return;
+    {

 
 

-    m_vSelectedBitmap.SetSelectedInto(this);
-    hBmp = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
+        m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
+        return;
+    }
+    m_vSelectedBitmap.SetSelectedInto(GetOwner());
+    m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);

 
 

-    if (hBmp == HBM_ERROR)
+    if (m_hOldBitmap == HBM_ERROR)

     {
         wxLogLastError(wxT("SelectObject(memDC, bitmap)"));
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }
     {
         wxLogLastError(wxT("SelectObject(memDC, bitmap)"));
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }

-    else if (!m_hOldBitmap)
-    {
-        m_hOldBitmap = hBmp;
-    }

 } // end of wxMemoryDC::SelectObject
 
 } // end of wxMemoryDC::SelectObject
 

-void wxMemoryDC::DoGetSize(
+void wxMemoryDCImpl::DoGetSize(

   int*                              pWidth
 , int*                              pHeight
 ) const
   int*                              pWidth
 , int*                              pHeight
 ) const


@@ -178,13 +210,3 @@ void wxMemoryDC::DoGetSize(
     *pWidth = m_vSelectedBitmap.GetWidth();
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize
     *pWidth = m_vSelectedBitmap.GetWidth();
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize

-
-void wxMemoryDC::DoDrawRectangle(
-  wxCoord                           vX
-, wxCoord                           vY
-, wxCoord                           vWidth
-, wxCoord                           vHeight
-)
-{
-    wxDC::DoDrawRectangle(vX, vY, vWidth, vHeight);
-} // end of wxMemoryDC::DoDrawRectangle