Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update OS/2 Frame WM_PAINT processing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-11-22 06:07:25 +00:00
parent 973f253905
commit fa5593acee
2 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/os2/dc.cpp
View File

@@ -204,34 +204,73 @@ void wxDC::SelectOldObjects(WXHDC dc)
// clipping // clipping
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define DO_SET_CLIPPING_BOX() \ #define DO_SET_CLIPPING_BOX() \
{ \ { \
RECT rect; \ RECTL rect; \
\ \
GetClipBox(GetHdc(), &rect); \ ::GpiQueryClipBox(m_hPS, &rect); \
\ \
m_clipX1 = (wxCoord) XDEV2LOG(rect.left); \ m_clipX1 = (wxCoord) XDEV2LOG(rect.xLeft); \
m_clipY1 = (wxCoord) YDEV2LOG(rect.top); \ m_clipY1 = (wxCoord) YDEV2LOG(rect.yTop); \
m_clipX2 = (wxCoord) XDEV2LOG(rect.right); \ m_clipX2 = (wxCoord) XDEV2LOG(rect.xRight); \
m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); \ m_clipY2 = (wxCoord) YDEV2LOG(rect.yBottom); \
} }
void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y void wxDC::DoSetClippingRegion(
,wxCoord width, wxCoord height wxCoord x
) , wxCoord y
, wxCoord width
, wxCoord height
)
{ {
// TODO RECTL vRect;
}
void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) m_clipping = TRUE;
vRect.xLeft = XLOG2DEV(x);
vRect.yTop = YLOG2DEV(y + height);
vRect.xRight = XLOG2DEV(x + width);
vRect.yBottom = YLOG2DEV(y);
::GpiIntersectClipRectangle(m_hPS, &vRect);
DO_SET_CLIPPING_BOX()
} // end of wxDC::DoSetClippingRegion
void wxDC::DoSetClippingRegionAsRegion(
const wxRegion& rRegion
)
{ {
// TODO wxCHECK_RET(rRegion.GetHRGN(), wxT("invalid clipping region"));
} HRGN hRgnOld;
m_clipping = TRUE;
::GpiSetClipRegion( m_hPS
,(HRGN)rRegion.GetHRGN()
,&hRgnOld
);
DO_SET_CLIPPING_BOX()
} // end of wxDC::DoSetClippingRegionAsRegion
void wxDC::DestroyClippingRegion(void) void wxDC::DestroyClippingRegion(void)
{ {
// TODO: if (m_clipping && m_hPS)
}; {
HRGN hRgnOld;
RECTL vRect;
// TODO: this should restore the previous clipped region
// so that OnPaint processing works correctly, and
// the update doesn't get destroyed after the first
// DestroyClippingRegion
vRect.xLeft = XLOG2DEV(0);
vRect.yTop = YLOG2DEV(32000);
vRect.xRight = XLOG2DEV(32000);
vRect.yBottom = YLOG2DEV(0);
HRGN hRgn = ::GpiCreateRegion(m_hPS, 1, &vRect);
::GpiSetClipRegion(m_hPS, hRgn, &hRgnOld);
}
m_clipping = FALSE;
} // end of wxDC::DestroyClippingRegion
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// query capabilities // query capabilities
@@ -300,7 +339,7 @@ bool wxDC::DoGetPixel(
vPoint.x = vX; vPoint.x = vX;
vPoint.y = vY; vPoint.y = vY;
lColor = ::GpiSetPel(m_hPS, &vPoint); lColor = ::GpiSetPel(m_hPS, &vPoint);
*pCol = lColor; pCol->Set((unsigned long)lColor);
if(lColor>= 0) if(lColor>= 0)
return(TRUE); return(TRUE);
else else

3
src/os2/frame.cpp
View File

@@ -1601,12 +1601,15 @@ MRESULT wxFrame::OS2WindowProc(
{ {
HPS hPS; HPS hPS;
RECTL vRect; RECTL vRect;
wxPaintEvent vEvent;
hPS = WinBeginPaint(m_hWnd, 0L, &vRect); hPS = WinBeginPaint(m_hWnd, 0L, &vRect);
::WinFillRect(hPS, &vRect, CLR_BLUE /* SYSCLR_WINDOW */); ::WinFillRect(hPS, &vRect, CLR_BLUE /* SYSCLR_WINDOW */);
::WinEndPaint(hPS); ::WinEndPaint(hPS);
mRc = (MRESULT)FALSE; mRc = (MRESULT)FALSE;
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
bProcessed = TRUE; bProcessed = TRUE;
} }
break; break;