ICCCM says that the TIMESTAMP atom is required, so provide it. This is patch 1424755...

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 435bbf1f3fd37b3d442f55a9e59e6b8e8e3873b7..a786f316410c4d942577bccf6ef73007aacf8998 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -38,9 +38,7 @@ wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 {
-    pOldDC->BeginDrawing();
     CreateCompatible(pOldDC);
-    pOldDC->EndDrawing();
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
@@ -58,14 +56,12 @@ void wxMemoryDC::Init()
     memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
 } // end of wxMemoryDC::Init
 
-bool wxMemoryDC::CreateCompatible(
-  wxDC*                             pDC
-)
+bool wxMemoryDC::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
@@ -78,10 +74,10 @@ bool wxMemoryDC::CreateCompatible(
         {
             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
@@ -117,7 +113,7 @@ bool wxMemoryDC::CreateCompatible(
     //
     // 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
@@ -146,25 +142,46 @@ void wxMemoryDC::SelectObject(
                  (rBitmap.GetSelectedInto() == this),
                  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;
 
-    WXHBITMAP                       hBmp = rBitmap.GetHBITMAP();
 
     if (!hBmp)
-        return;
+    {
 
+        m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
+        return;
+    }
     m_vSelectedBitmap.SetSelectedInto(this);
-    hBmp = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
+    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"));
     }
-    else if (!m_hOldBitmap)
-    {
-        m_hOldBitmap = hBmp;
-    }
 } // end of wxMemoryDC::SelectObject
 
 void wxMemoryDC::DoGetSize(
@@ -181,91 +198,3 @@ void 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);
-
-    //
-    // Debug testing:
-    //
-    if (m_vSelectedBitmap.GetHBITMAP() != NULLHANDLE)
-    {
-        BITMAPINFOHEADER2           vHeader;
-        BITMAPINFO2                 vInfo;
-
-        vHeader.cbFix = 16L;
-        if (::GpiQueryBitmapInfoHeader(m_vSelectedBitmap.GetHBITMAP(), &vHeader))
-        {
-            unsigned char*          pucData = NULL;
-            unsigned char*          pucBits;
-            int                     nBytesPerLine = vWidth * 3;
-            LONG                    lScans = 0L;
-            POINTL                  vPoint;
-            LONG                    lColor;
-
-            vInfo.cbFix     = 16;
-            vInfo.cx        = vHeader.cx;
-            vInfo.cy        = vHeader.cy;
-            vInfo.cPlanes   = vHeader.cPlanes;
-            vInfo.cBitCount = 24;
-            pucData = (unsigned char*)malloc(nBytesPerLine * m_vSelectedBitmap.GetHeight());
-            if ((lScans = ::GpiQueryBitmapBits( m_hPS
-                                               ,0L
-                                               ,(LONG)m_vSelectedBitmap.GetHeight()
-                                               ,(PBYTE)pucData
-                                               ,&vInfo
-                                              )) == GPI_ALTERROR)
-            {
-                ERRORID                     vError;
-                wxString                    sError;
-
-                vError = ::WinGetLastError(vHabmain);
-                sError = wxPMErrorToStr(vError);
-            }
-            pucBits = pucData;
-            for (int i = 0; i < m_vSelectedBitmap.GetHeight(); i++)
-            {
-                for (int j = vX; j < m_vSelectedBitmap.GetWidth(); j++)
-                {
-                    if (i >= vY && j >= vX && i < vHeight && j < vWidth)
-                    {
-                        vPoint.x = j; vPoint.y = i;
-                        if (i == vY || j == vX ||
-                            i == m_vSelectedBitmap.GetWidth() -1 ||
-                            j == m_vSelectedBitmap.GetHeight()
-                           )
-                            lColor = m_pen.GetColour().GetPixel();
-                        else
-                            lColor = m_brush.GetColour().GetPixel();
-                        *(pucBits++) = (unsigned char)lColor;
-                        *(pucBits++) = (unsigned char)(lColor >> 8);
-                        *(pucBits++) = (unsigned char)(lColor >> 16);
-                    }
-                    else
-                        pucBits += 3;
-                }
-            }
-            if ((lScans = ::GpiSetBitmapBits( m_hPS
-                                             ,0
-                                             ,(LONG)m_vSelectedBitmap.GetHeight()
-                                             ,(PBYTE)pucData
-                                             ,&vInfo
-                                            )) == GPI_ALTERROR)
-            {
-                ERRORID             vError;
-                wxString            sError;
-
-                vError = ::WinGetLastError(vHabmain);
-                sError = wxPMErrorToStr(vError);
-            }
-            free(pucData);
-        }
-    }
-} // end of wxMemoryDC::DoDrawRectangle
-