#ifndef WX_PRECOMP
#include "wx/utils.h"
+#include "wx/app.h"
+#include "wx/log.h"
#endif
#include "wx/os2/private.h"
// 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
-)
+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
{
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
//
// 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
(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 = m_vSelectedBitmap.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(
*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);
-} // end of wxMemoryDC::DoDrawRectangle