Fixes to resolve default Client Window painting when EVT_PAINT events are captured by derived classes downstream.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1030,10 +1030,10 @@ bool wxFrame::OS2Create(
|
|||||||
//
|
//
|
||||||
if (!::WinSetWindowPos( m_hWnd
|
if (!::WinSetWindowPos( m_hWnd
|
||||||
,HWND_TOP
|
,HWND_TOP
|
||||||
,nX + 20
|
,nX // + 20
|
||||||
,nY + 20
|
,nY // + 20
|
||||||
,nWidth - 60
|
,nWidth // - 60
|
||||||
,nHeight - 60
|
,nHeight // - 60
|
||||||
,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
|
,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
|
||||||
))
|
))
|
||||||
{
|
{
|
||||||
|
@@ -2845,6 +2845,35 @@ bool wxWindow::HandlePaint()
|
|||||||
|
|
||||||
m_updateRegion = wxRegion(hRgn);
|
m_updateRegion = wxRegion(hRgn);
|
||||||
vEvent.SetEventObject(this);
|
vEvent.SetEventObject(this);
|
||||||
|
if (!GetEventHandler()->ProcessEvent(vEvent))
|
||||||
|
{
|
||||||
|
HPS hPS;
|
||||||
|
|
||||||
|
hPS = ::WinBeginPaint( GetHwnd()
|
||||||
|
,NULLHANDLE
|
||||||
|
,&vRect
|
||||||
|
);
|
||||||
|
if(hPS)
|
||||||
|
{
|
||||||
|
::GpiCreateLogColorTable( hPS
|
||||||
|
,0L
|
||||||
|
,LCOLF_CONSECRGB
|
||||||
|
,0L
|
||||||
|
,(LONG)wxTheColourDatabase->m_nSize
|
||||||
|
,(PLONG)wxTheColourDatabase->m_palTable
|
||||||
|
);
|
||||||
|
::GpiCreateLogColorTable( hPS
|
||||||
|
,0L
|
||||||
|
,LCOLF_RGB
|
||||||
|
,0L
|
||||||
|
,0L
|
||||||
|
,NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
|
||||||
|
::WinEndPaint(hPS);
|
||||||
|
}
|
||||||
|
}
|
||||||
return (GetEventHandler()->ProcessEvent(vEvent));
|
return (GetEventHandler()->ProcessEvent(vEvent));
|
||||||
} // end of wxWindow::HandlePaint
|
} // end of wxWindow::HandlePaint
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user