update window before changing the scrolling position and really scrolling it to avoid...

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 7977733bb7a6b9c84d3dd49e615c0052cb9983b3..1332c9d2fbb91bbd0cbfa09e4ff64cd6b2b80edc 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:
@@ -12,35 +12,27 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/dcmemory.h"
+
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
 
-#include "wx/dcmemory.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
-wxMemoryDC::wxMemoryDC(void)
-{
-    CreateCompatible(NULL);
-    Init();
-} // end of wxMemoryDC::wxMemoryDC
-
 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 {
-    pOldDC->BeginDrawing();
     CreateCompatible(pOldDC);
-    pOldDC->EndDrawing();
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
@@ -58,14 +50,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 +68,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
@@ -102,27 +92,27 @@ bool wxMemoryDC::CreateCompatible(
         {
             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;
-        m_ok  = FALSE;
-        m_bOwnsDC = FALSE;
+        m_ok  = false;
+        m_bOwnsDC = false;
     }
 
     //
     // 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
 
-void wxMemoryDC::SelectObject(
+void wxMemoryDC::DoSelect(
   const wxBitmap&                   rBitmap
 )
 {
@@ -146,12 +136,36 @@ 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)
     {
+
         m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
         return;
     }
@@ -179,4 +193,3 @@ void wxMemoryDC::DoGetSize(
     *pWidth = m_vSelectedBitmap.GetWidth();
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize
-