fixed event generation for wxChoice: it now sends one and exactly one wxEVT_COMMAND_C...

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 6383d1a8766b47b7473b850c9391fb314e1522b9..a786f316410c4d942577bccf6ef73007aacf8998 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -24,12 +24,6 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
-extern void wxLoadBitmapWithData( HPS     hPS
-                                 ,HBITMAP hBitmap
-                                 ,int     nWidth
-                                 ,int     nHeight
-                                );
-
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
@@ -44,9 +38,7 @@ wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 {
-    pOldDC->BeginDrawing();
     CreateCompatible(pOldDC);
-    pOldDC->EndDrawing();
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
@@ -64,14 +56,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
@@ -84,10 +74,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
@@ -123,7 +113,7 @@ bool wxMemoryDC::CreateCompatible(
     //
     // 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
@@ -152,25 +142,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(
@@ -187,122 +198,3 @@ 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);
-
-    wxLoadBitmapWithData( m_hPS
-                         ,(HBITMAP)m_vSelectedBitmap.GetHBITMAP()
-                         ,m_vSelectedBitmap.GetWidth()
-                         ,m_vSelectedBitmap.GetHeight()
-                        );
-} // end of wxMemoryDC::DoDrawRectangle
-
-void wxMemoryDC::DoDrawRoundedRectangle(
-  wxCoord                           vX
-, wxCoord                           vY
-, wxCoord                           vWidth
-, wxCoord                           vHeight
-, double                            dRadius
-)
-{
-    wxDC::DoDrawRoundedRectangle(vX, vY, vWidth, vHeight, dRadius);
-
-    wxLoadBitmapWithData( m_hPS
-                         ,(HBITMAP)m_vSelectedBitmap.GetHBITMAP()
-                         ,m_vSelectedBitmap.GetWidth()
-                         ,m_vSelectedBitmap.GetHeight()
-                        );
-} // end of wxMemoryDC::DoDrawRoundedRectangle
-
-void wxMemoryDC::DoDrawText(
-  const wxString&                   rsText
-, wxCoord                           vX
-, wxCoord                           vY
-)
-{
-    wxDC::DoDrawText(rsText, vX, vY);
-
-    wxLoadBitmapWithData( m_hPS
-                         ,(HBITMAP)m_vSelectedBitmap.GetHBITMAP()
-                         ,m_vSelectedBitmap.GetWidth()
-                         ,m_vSelectedBitmap.GetHeight()
-                        );
-} // end of wxMemoryDC::DoDrawRectangle
-
-void wxMemoryDC::DoDrawLine(
-  wxCoord                           vX1
-, wxCoord                           vY1
-, wxCoord                           vX2
-, wxCoord                           vY2
-)
-{
-    wxDC::DoDrawLine(vX1, vY1, vX2, vY2);
-
-    wxLoadBitmapWithData( m_hPS
-                         ,(HBITMAP)m_vSelectedBitmap.GetHBITMAP()
-                         ,m_vSelectedBitmap.GetWidth()
-                         ,m_vSelectedBitmap.GetHeight()
-                        );
-} // end of wxMemoryDC::DoDrawRoundedRectangle
-
-void wxLoadBitmapWithData(
-  HPS                               hPS
-, HBITMAP                           hBitmap
-, int                               nWidth
-, int                               nHeight
-)
-{
-    BITMAPINFOHEADER2               vHeader;
-    BITMAPINFO2                     vInfo;
-
-    vHeader.cbFix = 16L;
-    if (::GpiQueryBitmapInfoHeader(hBitmap, &vHeader))
-    {
-        unsigned char*              pucData = NULL;
-        unsigned char*              pucBits;
-        int                         nBytesPerLine = nWidth * 3;
-        LONG                        lScans = 0L;
-        POINTL                      vPoint;
-        LONG                        lColor;
-
-        vInfo.cbFix     = 16;
-        vInfo.cx        = vHeader.cx;
-        vInfo.cy        = vHeader.cy;
-        vInfo.cPlanes   = vHeader.cPlanes;
-        vInfo.cBitCount = 24;
-        pucData = (unsigned char*)malloc(nBytesPerLine * nHeight);
-        pucBits = pucData;
-        for (int i = 0; i < nHeight; i++)
-        {
-            for (int j = 0; j < nWidth; j++)
-            {
-                vPoint.x = j; vPoint.y = i;
-                lColor = ::GpiQueryPel(hPS, &vPoint);
-                *(pucBits++) = (unsigned char)lColor;
-                *(pucBits++) = (unsigned char)(lColor >> 8);
-                *(pucBits++) = (unsigned char)(lColor >> 16);
-            }
-        }
-        if ((lScans = ::GpiSetBitmapBits( hPS
-                                         ,0
-                                         ,(LONG)nHeight
-                                         ,(PBYTE)pucData
-                                         ,&vInfo
-                                        )) == GPI_ALTERROR)
-        {
-            ERRORID             vError;
-            wxString            sError;
-
-            vError = ::WinGetLastError(vHabmain);
-            sError = wxPMErrorToStr(vError);
-        }
-        free(pucData);
-    }
-}