From ba2abe8530d14a04aac1965a449d935f648e7b9c Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 18 Apr 2002 13:30:53 +0000 Subject: [PATCH] back to void for DoFloodFill git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/dc.h | 2 +- src/os2/dc.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index c3d383cd2a..87d00092a2 100644 --- 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 cb5f939294..97828b4acf 100644 --- 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 -- 2.45.2