wxUniversal fixes:

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

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index cb5f93929421b86d5edd382c5d4cda0d329dd900..9a58657da1af201924e7fac723b0ebee3c370bbc 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -567,6 +567,8 @@ bool wxDC::DoFloodFill(
     POINTL                          vPtlPos;
     LONG                            lColor;
     LONG                            lOptions;
     POINTL                          vPtlPos;
     LONG                            lColor;
     LONG                            lOptions;

+    LONG                            lHits;
+    bool                            bSuccess = FALSE;

 
     vPtlPos.x = vX;             // Loads x-coordinate
     vPtlPos.y = OS2Y(vY,0);     // Loads y-coordinate
 
     vPtlPos.x = vX;             // Loads x-coordinate
     vPtlPos.y = OS2Y(vY,0);     // Loads y-coordinate


@@ -576,8 +578,8 @@ bool wxDC::DoFloodFill(
     if(wxFLOOD_SURFACE == nStyle)
         lOptions = FF_SURFACE;
 
     if(wxFLOOD_SURFACE == nStyle)
         lOptions = FF_SURFACE;
 

-    ::GpiFloodFill(m_hPS, lOptions, lColor);
-    
+    if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR)
+        bSuccess = TRUE;

     return TRUE;
 } // end of wxDC::DoFloodFill
 
     return TRUE;
 } // end of wxDC::DoFloodFill
 


@@ -976,7 +978,14 @@ void wxDC::DoDrawRectangle(
     LONG                            lBorderColor;
     int                             nIsTRANSPARENT = 0;
 
     LONG                            lBorderColor;
     int                             nIsTRANSPARENT = 0;
 

-    vY = OS2Y(vY,vHeight);
+    //
+    // Might be a memory DC with no Paint rect
+    //
+    if (!(m_vRclPaint.yTop == 0 &&
+          m_vRclPaint.yBottom == 0 &&
+          m_vRclPaint.xRight == 0 &&
+          m_vRclPaint.xLeft == 0))
+        vY = OS2Y(vY,vHeight);

 
     wxCoord                         vX2 = vX + vWidth;
     wxCoord                         vY2 = vY + vHeight;
 
     wxCoord                         vX2 = vX + vWidth;
     wxCoord                         vY2 = vY + vHeight;


@@ -1031,6 +1040,54 @@ void wxDC::DoDrawRectangle(
                  ,0L
                  ,0L
                 );
                  ,0L
                  ,0L
                 );

+        //
+        // Debug testing:
+        //
+        if (m_vSelectedBitmap != wxNullBitmap)
+        {
+            BITMAPINFOHEADER2           vHeader;
+            BITMAPINFO2                 vInfo;
+
+            vHeader.cbFix = 16L;
+            if (::GpiQueryBitmapInfoHeader(m_hPS, &vHeader))
+            {
+                int                     nBytesPerLine = vHeader.cBitCount/8;
+                unsigned char*          pucData = NULL;
+                unsigned char*          pucBits;
+                LONG                    lScans = 0L;
+
+                vInfo.cbFix = 16;
+                vInfo.cx              = vHeader.cx;
+                vInfo.cy              = vHeader.cy;
+                vInfo.cPlanes         = vHeader.cPlanes;
+                vInfo.cBitCount       = vHeader.cBitCount;
+                pucData = (unsigned char*)malloc(nBytesPerLine * vHeight);
+                pucBits = pucData;
+                for (int i = 0; i < vHeight; i++)
+                {
+                    if (i <= m_vSelectedBitmap.GetHeight())
+                    {
+                        for (int j = 0; j < vWidth; j++)
+                        {
+                            if (j <= m_vSelectedBitmap.GetWidth())
+                            {
+                                vPoint[0].x = j; vPoint[0].y = i;
+                                lColor = ::GpiQueryPel(m_hPS, &vPoint[0]);
+                                *(pucBits++) = lColor >> 24;
+                                *(pucBits++) = lColor >> 16;
+                                *(pucBits++) = lColor >> 8;
+                            }
+                        }
+                    }
+                }
+                lScans = ::GpiSetBitmapBits( m_hPS
+                                            ,0             // Start at the bottom
+                                            ,(LONG)vHeight // One line per scan
+                                            ,(PBYTE)pucData
+                                            ,&vInfo
+                                           );
+            }
+        }

     }
     CalcBoundingBox(vX, vY);
     CalcBoundingBox(vX2, vY2);
     }
     CalcBoundingBox(vX, vY);
     CalcBoundingBox(vX2, vY2);


@@ -1226,6 +1283,9 @@ void wxDC::DoDrawBitmap(
 
         vY = OS2Y(vY,rBmp.GetHeight());
 
 
         vY = OS2Y(vY,rBmp.GetHeight());
 

+        //
+        // Flip the picture as OS/2 is upside-down
+        //

         POINTL                      vPoint[4] = { vX, vY + rBmp.GetHeight()
                                                  ,vX + rBmp.GetWidth(), vY
                                                  ,0, 0
         POINTL                      vPoint[4] = { vX, vY + rBmp.GetHeight()
                                                  ,vX + rBmp.GetWidth(), vY
                                                  ,0, 0