a fix for the last fix

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 7f28afd8dd81e6710e6d47c525623077f8b512fa..d303b5aa0283f00a39065585fa1f045911f3a520 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -20,72 +20,195 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)

-#endif

 
 

-/*
- * Memory DC
- *
- */
+/////////////////////////////////////////////////////////////////////////////
+// Memory DC
+/////////////////////////////////////////////////////////////////////////////

 
 wxMemoryDC::wxMemoryDC(void)
 {
 
 wxMemoryDC::wxMemoryDC(void)
 {

-  // TODO:
-/*
-  m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) NULL);
-  m_ok = (m_hDC != 0);
-  m_bOwnsDC = TRUE;
-
-  SetBrush(*wxWHITE_BRUSH);
-  SetPen(*wxBLACK_PEN);
-
-  // the background mode is only used for text background
-  // and is set in DrawText() to OPAQUE as required, other-
-  // wise always TRANSPARENT, RR
-  ::SetBkMode( GetHdc(), TRANSPARENT );
-*/
-}
-
-wxMemoryDC::wxMemoryDC(wxDC *old_dc)
+    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;
+    }
+} // end of wxMemoryDC::wxMemoryDC
+
+wxMemoryDC::wxMemoryDC(
+  wxDC*                             pOldDC
+)

 {
 {

-  // TODO:
-/*
-  old_dc->BeginDrawing();
-
-  m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) old_dc->GetHDC());
-  m_ok = (m_hDC != 0);
-
-  old_dc->EndDrawing();
-
-  SetBrush(*wxWHITE_BRUSH);
-  SetPen(*wxBLACK_PEN);
-
-  // the background mode is only used for text background
-  // and is set in DrawText() to OPAQUE as required, other-
-  // wise always TRANSPARENT, RR
-  ::SetBkMode( GetHdc(), TRANSPARENT );
-*/
-}
-
-wxMemoryDC::~wxMemoryDC(void)
+    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
+    //
+    hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, GetHdcOf(*pOldDC));
+    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;
+            pOldDC->EndDrawing();
+            SetBrush(*wxWHITE_BRUSH);
+            SetPen(*wxBLACK_PEN);
+        }
+        else
+        {
+            pOldDC->EndDrawing();
+            m_hPS = NULLHANDLE;
+            m_hDC = NULLHANDLE;
+            m_ok  = FALSE;
+            m_bOwnsDC = FALSE;
+        }
+    }
+    else
+    {
+        pOldDC->EndDrawing();
+        m_hPS = NULLHANDLE;
+        m_hDC = NULLHANDLE;
+        m_ok  = FALSE;
+        m_bOwnsDC = FALSE;
+    }
+} // end of wxMemoryDC::wxMemoryDC
+
+wxMemoryDC::~wxMemoryDC()

 {
 {

-};
-
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+    m_vSelectedBitmap.SetSelectedInto(NULL);
+    if (m_hPS != NULLHANDLE)
+        ::GpiDestroyPS(m_hPS);
+    if (m_hDC != NULLHANDLE)
+        ::DevCloseDC(m_hDC);
+} // end of wxMemoryDC::~wxMemoryDC
+
+void wxMemoryDC::SelectObject(
+  const wxBitmap&                   rBitmap
+)

 {
 {

-   // TODO:
-};
-
-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+    //
+    // Select old bitmap out of the device context
+    //
+    if (m_hOldBitmap)
+    {
+        ::GpiSetBitmap(m_hPS, NULLHANDLE);
+        if (m_vSelectedBitmap.Ok())
+        {
+            m_vSelectedBitmap.SetSelectedInto(NULL);
+            m_vSelectedBitmap = wxNullBitmap;
+        }
+    }
+
+    //
+    // Check for whether the bitmap is already selected into a device context
+    //
+    wxCHECK_RET( !rBitmap.GetSelectedInto() ||
+                 (rBitmap.GetSelectedInto() == this),
+                 wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
+
+    m_vSelectedBitmap = rBitmap;
+
+    WXHBITMAP                       hBmp = m_vSelectedBitmap.GetHBITMAP();
+
+    if (!hBmp)
+        return;
+
+    m_vSelectedBitmap.SetSelectedInto(this);
+    hBmp = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
+
+    if (hBmp == 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(
+  int*                              pWidth
+, int*                              pHeight
+) const

 {
 {

-  if (!m_selectedBitmap.Ok())
-  {
-    *width = 0; *height = 0;
-    return;
-  }
-  *width = m_selectedBitmap.GetWidth();
-  *height = m_selectedBitmap.GetHeight();
-};
+    if (!m_vSelectedBitmap.Ok())
+    {
+        *pWidth  = 0;
+        *pHeight = 0;
+        return;
+    }
+    *pWidth = m_vSelectedBitmap.GetWidth();
+    *pHeight = m_vSelectedBitmap.GetHeight();
+} // end of wxMemoryDC::DoGetSize