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

reverted unrelated changes accidentally committed as part of r49411

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-28 00:00:12 +00:00
parent f53c863825
commit 06d7ed27a1
1 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/window.cpp
View File

@@ -4555,28 +4555,19 @@ void wxWindowMSW::OnEraseBackground(wxEraseEvent& event)
return; return;
} }
switch ( GetBackgroundStyle() ) if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
{ {
default:
wxFAIL_MSG( _T("Unknown background style") );
// fall through
case wxBG_STYLE_SYSTEM:
case wxBG_STYLE_COLOUR:
// do default background painting
if ( !DoEraseBackground(GetHdcOf(*event.GetDC())) )
{
// let the system paint the background
event.Skip();
}
case wxBG_STYLE_CUSTOM:
// don't skip the event here, custom background means that the app // don't skip the event here, custom background means that the app
// is drawing it itself in its OnPaint(), so don't draw it at all // is drawing it itself in its OnPaint(), so don't draw it at all
// now to avoid flicker // now to avoid flicker
return; return;
}
case wxBG_STYLE_TRANSPARENT:
// do default background painting
if ( !DoEraseBackground(GetHdcOf(*event.GetDC())) )
{
// let the system paint the background
event.Skip(); event.Skip();
} }
} }
@@ -5948,18 +5939,10 @@ WXWORD wxCharCodeWXToMSW(int wxk, bool *isVirtual)
break; break;
default: default:
// check to see if its one of the OEM key codes.
BYTE vks = LOBYTE(VkKeyScan(wxk));
if ( vks != -1 )
{
vk = vks;
}
else
{
if ( isVirtual ) if ( isVirtual )
*isVirtual = false; *isVirtual = false;
vk = (WXWORD)wxk; vk = (WXWORD)wxk;
} break;
} }
return vk; return vk;