X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d0edc0f7306aac10a75c545f9cace25d3cee83d..f68535b0a71224f6da88857e530607c12cd280eb:/src/os2/dcmemory.cpp

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 456e93e3d3..95c5e30a56 100644
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -81,7 +81,7 @@ bool wxMemoryDC::CreateCompatible(
             m_ok = TRUE;
             m_bOwnsDC = TRUE;
             //
-            // Set the wxWindows color table
+            // Set the wxWidgets color table
             //
             ::GpiCreateLogColorTable( m_hPS
                                      ,0L
@@ -146,25 +146,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(
@@ -182,12 +203,3 @@ void wxMemoryDC::DoGetSize(
     *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