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

Merge between dev and stable

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-03-28 05:10:48 +00:00
parent 809527ae06
commit 8527a3f264
6 changed files with 135 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/os2/window.cpp
View File

@@ -2357,7 +2357,7 @@ bool wxWindow::OS2Create(
(ULONG)zClass == (ULONG)WC_COMBOBOX ||
(ULONG)zClass == (ULONG)WC_CONTAINER ||
(ULONG)zClass == (ULONG)WC_ENTRYFIELD ||
(ULONG)zClass == (ULONG)WC_FRAME ||
(ULONG)zClass == (ULONG)WC_FRAME ||
(ULONG)zClass == (ULONG)WC_LISTBOX ||
(ULONG)zClass == (ULONG)WC_MENU ||
(ULONG)zClass == (ULONG)WC_NOTEBOOK ||
@@ -2796,6 +2796,9 @@ void wxWindow::OnSysColourChanged(
bool wxWindow::HandlePaint()
{
HRGN hRgn = NULLHANDLE;
wxPaintEvent vEvent;
HPS hPS;
RECTL vRect;
if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_NULL)
{
@@ -2804,7 +2807,9 @@ bool wxWindow::HandlePaint()
}
m_updateRegion = wxRegion(hRgn);
wxPaintEvent vEvent;
hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
WinEndPaint(hPS);
vEvent.SetEventObject(this);
return (GetEventHandler()->ProcessEvent(vEvent));