Various compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-02-11 12:04:35 +00:00
parent 6a44bffd1a
commit 1b0b798d77
5 changed files with 16 additions and 7 deletions

View File

@@ -325,7 +325,11 @@ void wxWindowX11::DoCaptureMouse()
}
res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
#if 0
ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
#else
FALSE,
#endif
GrabModeAsync,
GrabModeAsync,
CurrentTime);
@@ -1309,8 +1313,9 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
if (!GetMainWindow())
return FALSE;
wxColour colour( col );
XSetWindowAttributes attrib;
attrib.background_pixel = ((wxColour&)col).AllocColour(wxGlobalDisplay());
attrib.background_pixel = colour.AllocColour(wxGlobalDisplay());
XChangeWindowAttributes(wxGlobalDisplay(),
(Window) GetMainWindow(),