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

wxUniversal fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-16 19:39:25 +00:00
parent d0430ee2ba
commit 09cbc94fea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/window.cpp
View File

@@ -4056,7 +4056,7 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC) WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
{ {
for ( wxWindow *win = this; win; win = win->GetParent() ) for ( wxWindow *win = (wxWindow *)this; win; win = win->GetParent() )
{ {
// background is not inherited beyond the containing TLW // background is not inherited beyond the containing TLW
if ( win->IsTopLevel() ) if ( win->IsTopLevel() )
@@ -5089,7 +5089,7 @@ bool wxGetKeyState(wxKeyCode key)
bool bVirtual; bool bVirtual;
//High order with GetAsyncKeyState only available on WIN32 //High order with GetAsyncKeyState only available on WIN32
#ifdef __WIN32__ #ifdef __WIN32__
//If the requested key is a LED key, return //If the requested key is a LED key, return
//true if the led is pressed //true if the led is pressed
if (key == WXK_NUMLOCK || if (key == WXK_NUMLOCK ||
@@ -5097,12 +5097,12 @@ bool wxGetKeyState(wxKeyCode key)
key == WXK_SCROLL) key == WXK_SCROLL)
{ {
#endif #endif
//low order bit means LED is highlighted, //low order bit means LED is highlighted,
//high order means key is down //high order means key is down
//Here, for compat with other ports we want both //Here, for compat with other ports we want both
return GetKeyState( wxCharCodeWXToMSW(key, &bVirtual) ) != 0; return GetKeyState( wxCharCodeWXToMSW(key, &bVirtual) ) != 0;
#ifdef __WIN32__ #ifdef __WIN32__
} }
else else
{ {