Uncommented Brian Vitors stuff...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 081a954c0201898c7ee5309131ba4dd0fe6d9527..93e52b192d86da24d77c352893c51aa2b6357198 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -262,8 +262,13 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
             return false;
         }
     }
             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);
   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;
     }
   }
   return modes;

-    */
-}
-
-
-#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
-
-wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
-{
-    // Not implemented
-    return wxArrayVideoModes();

 }
 
 wxVideoMode wxDisplay::GetCurrentMode() const
 }
 
 wxVideoMode wxDisplay::GetCurrentMode() const