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

Lots of OS/2 fixes mostly to do with painting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-12-18 05:34:25 +00:00
parent 702c190d47
commit 8d854fa93f
7 changed files with 579 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/os2/frame.cpp
View File

@@ -984,6 +984,22 @@ bool wxFrame::OS2Create(
wxAssociateWinWithHandle(m_hWnd, this);
wxAssociateWinWithHandle(m_hFrame, this);
m_backgroundColour.Set(wxString("GREY"));
LONG lColor = (LONG)m_backgroundColour.GetPixel();
if (!::WinSetPresParam( m_hWnd
,PP_BACKGROUNDCOLOR
,sizeof(LONG)
,(PVOID)&lColor
))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError("Error creating frame. Error: %s\n", sError);
return FALSE;
}
//
// Now need to subclass window. Instead of calling the SubClassWin in wxWindow
// we manually subclass here because we don't want to use the main wxWndProc
@@ -1276,8 +1292,7 @@ bool wxFrame::HandlePaint()
}
else
{
wxWindow::HandlePaint();
return TRUE;
return(wxWindow::HandlePaint());
}
}
else
@@ -1585,23 +1600,22 @@ MRESULT wxFrame::OS2WindowProc(
break;
case WM_PAINT:
{
HPS hPS;
RECTL vRect;
wxPaintEvent vEvent;
hPS = WinBeginPaint(m_hWnd, 0L, &vRect);
::WinFillRect(hPS, &vRect, CLR_BLUE /* SYSCLR_WINDOW */);
::WinEndPaint(hPS);
mRc = (MRESULT)FALSE;
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
bProcessed = TRUE;
}
bProcessed = HandlePaint();
mRc = (MRESULT)FALSE;
break;
case WM_COMMAND:
case WM_ERASEBACKGROUND:
//
// Returning TRUE to requests PM to paint the window background
// in SYSCLR_WINDOW. We capture this here because the PS returned
// in Frames is the PS for the whole frame, which we can't really
// use at all. If you want to paint a different background, do it
// in an OnPaint using a wxPaintDC.
//
mRc = (MRESULT)(TRUE);
break;
case WM_COMMAND:
{
WORD wId;
WORD wCmd;
@@ -1656,15 +1670,6 @@ MRESULT wxFrame::OS2WindowProc(
mRc = (MRESULT)FALSE;
break;
case WM_ERASEBACKGROUND:
//
// Return TRUE to request PM to paint the window background
// in SYSCLR_WINDOW.
//
bProcessed = TRUE;
mRc = (MRESULT)(TRUE);
break;
case CM_QUERYDRAGIMAGE:
{
HPOINTER hIcon;