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

Brian Victor's Patch & Cleanups

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-13 09:25:29 +00:00
parent 63c51a937e
commit f2ebd959e6
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/unix/displayx11.cpp
View File

@@ -81,9 +81,9 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
for (i = 0; i < numscreens; ++i) for (i = 0; i < numscreens; ++i)
{ {
if (p.x >= screenarr[i].x_org && if (p.x >= screenarr[i].x_org &&
p.x <= screenarr[i].x_org + screenarr[i].width && p.x < screenarr[i].x_org + screenarr[i].width &&
p.y >= screenarr[i].y_org && p.y >= screenarr[i].y_org &&
p.y <= screenarr[i].y_org + screenarr[i].height) p.y < screenarr[i].y_org + screenarr[i].height)
{ {
which_screen = i; which_screen = i;
} }
@@ -96,9 +96,9 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
{ {
wxSize size = wxGetDisplaySize(); wxSize size = wxGetDisplaySize();
if (p.x >= 0 && if (p.x >= 0 &&
p.x <= size.GetWidth() && p.x < size.GetWidth() &&
p.y > 0 && p.y >= 0 &&
p.y <= size.GetHeight()) p.y < size.GetHeight())
{ {
return 0; return 0;
} }
@@ -256,6 +256,22 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
return false; return false;
} }
} }
/*
//Brian Victor's patch (X11 can't change bit depth yet), here for reference
Display *disp = (Display*)wxGetDisplay();
int count_return;
int* depths = XListDepths(disp, 0, &count_return);
wxArrayVideoModes modes;
if (depths)
{
int x;
for (x = 0; x < count_return; ++x)
{
modes.Add(wxVideoMode(m_priv->m_rect.GetWidth(), m_priv->m_rect.GetHeight(), depths[x]));
}
}
return modes;
*/
} }
#endif /* wxUSE_DISPLAY */ #endif /* wxUSE_DISPLAY */