don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index d303b5aa0283f00a39065585fa1f045911f3a520..5e2ed33694f245e22181a3e82abf5f047ec5ca69 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -14,6 +14,8 @@
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"

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

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


@@ -28,88 +30,47 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 wxMemoryDC::wxMemoryDC(void)
 {
 
 wxMemoryDC::wxMemoryDC(void)
 {

-    ERRORID                         vError;
-    wxString                        sError;
-    HDC                             hDC;
-    HPS                             hPS;
-    DEVOPENSTRUC                    vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
-    SIZEL                           vSize = {0, 0};
-
-    //
-    // Create a memory device context
-    //
-    hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE);
-    if (hDC != DEV_ERROR)
-    {
-        hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
-        if (hPS != GPI_ERROR)
-        {
-            m_hPS = hPS;
-            m_hDC = hDC;
-            m_ok = TRUE;
-            m_bOwnsDC = TRUE;
-            SetBrush(*wxWHITE_BRUSH);
-            SetPen(*wxBLACK_PEN);
-            if (!::GpiCreateLogColorTable( m_hPS
-                                          ,0L
-                                          ,LCOLF_CONSECRGB
-                                          ,0L
-                                          ,(LONG)wxTheColourDatabase->m_nSize
-                                          ,(PLONG)wxTheColourDatabase->m_palTable
-                                         ))
-            {
-                vError = ::WinGetLastError(vHabmain);
-                sError = wxPMErrorToStr(vError);
-                wxLogError("Unable to set current color table. Error: %s\n", sError);
-            }
-            //
-            // Set the color table to RGB mode
-            //
-            if (!::GpiCreateLogColorTable( m_hPS
-                                          ,0L
-                                          ,LCOLF_RGB
-                                          ,0L
-                                          ,0L
-                                          ,NULL
-                                         ))
-            {
-                vError = ::WinGetLastError(vHabmain);
-                sError = wxPMErrorToStr(vError);
-                wxLogError("Unable to set current color table. Error: %s\n", sError);
-            }
-        }
-        else
-        {
-            m_hPS = NULLHANDLE;
-            m_hDC = NULLHANDLE;
-            m_ok  = FALSE;
-            m_bOwnsDC = FALSE;
-        }
-    }
-    else
-    {
-        m_hPS = NULLHANDLE;
-        m_hDC = NULLHANDLE;
-        m_ok  = FALSE;
-        m_bOwnsDC = FALSE;
-    }
+    CreateCompatible(NULL);
+    Init();

 } // end of wxMemoryDC::wxMemoryDC
 
 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 } // end of wxMemoryDC::wxMemoryDC
 
 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )

+{
+    pOldDC->BeginDrawing();
+    CreateCompatible(pOldDC);
+    pOldDC->EndDrawing();
+    Init();
+} // end of wxMemoryDC::wxMemoryDC
+
+void wxMemoryDC::Init()
+{
+    if (m_ok)
+    {
+        SetBrush(*wxWHITE_BRUSH);
+        SetPen(*wxBLACK_PEN);
+
+        // the background mode is only used for text background and is set in
+        // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
+        ::GpiSetBackMix( GetHPS(), BM_LEAVEALONE );
+    }
+    memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
+} // end of wxMemoryDC::Init
+
+bool wxMemoryDC::CreateCompatible(
+  wxDC*                             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};
 

-    pOldDC->BeginDrawing();
-

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

-    hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, GetHdcOf(*pOldDC));
+    hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE);

     if (hDC != DEV_ERROR)
     {
         hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
     if (hDC != DEV_ERROR)
     {
         hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);


@@ -119,13 +80,26 @@ wxMemoryDC::wxMemoryDC(
             m_hDC = hDC;
             m_ok = TRUE;
             m_bOwnsDC = TRUE;
             m_hDC = hDC;
             m_ok = TRUE;
             m_bOwnsDC = TRUE;

-            pOldDC->EndDrawing();
-            SetBrush(*wxWHITE_BRUSH);
-            SetPen(*wxBLACK_PEN);
+            //
+            // Set the wxWindows color table
+            //
+            ::GpiCreateLogColorTable( m_hPS
+                                     ,0L
+                                     ,LCOLF_CONSECRGB
+                                     ,0L
+                                     ,(LONG)wxTheColourDatabase->m_nSize
+                                     ,(PLONG)wxTheColourDatabase->m_palTable
+                                    );
+            ::GpiCreateLogColorTable( m_hPS
+                                     ,0L
+                                     ,LCOLF_RGB
+                                     ,0L
+                                     ,0L
+                                     ,NULL
+                                    );

         }
         else
         {
         }
         else
         {

-            pOldDC->EndDrawing();

             m_hPS = NULLHANDLE;
             m_hDC = NULLHANDLE;
             m_ok  = FALSE;
             m_hPS = NULLHANDLE;
             m_hDC = NULLHANDLE;
             m_ok  = FALSE;


@@ -134,22 +108,19 @@ wxMemoryDC::wxMemoryDC(
     }
     else
     {
     }
     else
     {

-        pOldDC->EndDrawing();

         m_hPS = NULLHANDLE;
         m_hDC = NULLHANDLE;
         m_ok  = FALSE;
         m_bOwnsDC = FALSE;
     }
         m_hPS = NULLHANDLE;
         m_hDC = NULLHANDLE;
         m_ok  = FALSE;
         m_bOwnsDC = FALSE;
     }

-} // end of wxMemoryDC::wxMemoryDC

 
 

-wxMemoryDC::~wxMemoryDC()
-{
-    m_vSelectedBitmap.SetSelectedInto(NULL);
-    if (m_hPS != NULLHANDLE)
-        ::GpiDestroyPS(m_hPS);
-    if (m_hDC != NULLHANDLE)
-        ::DevCloseDC(m_hDC);
-} // end of wxMemoryDC::~wxMemoryDC
+    //
+    // As we created the DC, we must delete it in the dtor
+    //
+    m_bOwnsDC = TRUE;
+    m_ok = m_hDC != 0;
+    return m_ok;
+} // end of wxMemoryDC::CreateCompatible

 
 void wxMemoryDC::SelectObject(
   const wxBitmap&                   rBitmap
 
 void wxMemoryDC::SelectObject(
   const wxBitmap&                   rBitmap


@@ -175,25 +146,45 @@ void wxMemoryDC::SelectObject(
                  (rBitmap.GetSelectedInto() == this),
                  wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
                  (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;
 
     m_vSelectedBitmap = rBitmap;
 

-    WXHBITMAP                       hBmp = m_vSelectedBitmap.GetHBITMAP();

 
     if (!hBmp)
 
     if (!hBmp)

-        return;
+    {

 
 

+        m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
+        return;
+    }

     m_vSelectedBitmap.SetSelectedInto(this);
     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"));
     }
     {
         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(
 } // end of wxMemoryDC::SelectObject
 
 void wxMemoryDC::DoGetSize(


@@ -211,4 +202,3 @@ void wxMemoryDC::DoGetSize(
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize
 
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize
 

-