From e5804ce70a3fce7ca0234855bb496adb819c8bb5 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Mon, 15 Dec 2003 00:05:04 +0000 Subject: [PATCH] Uncommented Brian Vitors stuff... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/displayx11.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 081a954c02..93e52b192d 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -262,8 +262,13 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode) return false; } } - /* - //Brian Victor's patch (X11 can't change bit depth yet), here for reference +} + + +#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H + +wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const +{ Display *disp = (Display*)wxGetDisplay(); int count_return; int* depths = XListDepths(disp, 0, &count_return); @@ -277,16 +282,6 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode) } } return modes; - */ -} - - -#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H - -wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const -{ - // Not implemented - return wxArrayVideoModes(); } wxVideoMode wxDisplay::GetCurrentMode() const