back to void for DoFloodFill

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index c3d383cd2a78796baa77bac5370df84d17a0799b..87d00092a235072983cef044010bb0ca1f1aa40a 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -202,7 +202,7 @@ public:
 #endif
 
 protected:
-    virtual bool DoFloodFill( wxCoord         vX
+    virtual void DoFloodFill( wxCoord         vX
                              ,wxCoord         vY
                              ,const wxColour& rCol
                              ,int             nStyle = wxFLOOD_SURFACE

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index cb5f93929421b86d5edd382c5d4cda0d329dd900..97828b4acfd8ba1635e8bf8601249115700a508d 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -557,7 +557,7 @@ void wxDC::Clear()
     ::GpiErase(m_hPS);
 } // end of wxDC::Clear
 
-bool wxDC::DoFloodFill(
+void wxDC::DoFloodFill(
   wxCoord                           vX
 , wxCoord                           vY
 , const wxColour&                   rCol
@@ -577,8 +577,7 @@ bool wxDC::DoFloodFill(
         lOptions = FF_SURFACE;
 
     ::GpiFloodFill(m_hPS, lOptions, lColor);
-    
-    return TRUE;
+
 } // end of wxDC::DoFloodFill
 
 bool wxDC::DoGetPixel(
@@ -1226,6 +1225,9 @@ void wxDC::DoDrawBitmap(
 
         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