From f369a1c994806633b92fefeced937eafde1f10b1 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 15 Nov 2013 17:28:42 +0000 Subject: [PATCH] Simplify mode matching test, and add actual mode (not function parameter) to modes list, in GetModes() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/displayx11.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 0ecfa4ac5a..51f1335d19 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -252,8 +252,7 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const { XF86VidModeModeInfo& info = *ppXModes[i]; const wxVideoMode vm = wxCVM(info, display, nScreen); - if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode... - mode.Matches(vm)) //...? + if (vm.Matches(mode)) { Modes.Add(vm); } @@ -341,7 +340,7 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const wxVideoMode mode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]); if ( mode.Matches(modeMatch) ) { - modes.Add(modeMatch); + modes.Add(mode); } }