X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/505c8ccdb3c1c59eb14b019c4386d1a0b10224b0..6258e418a07e8edda218c27aade9e522deaeaf74:/src/unix/displayx11.cpp

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 081a954c02..a51285f3b8 100644
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     12/05/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -119,6 +119,7 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
     XineramaScreenInfo *screenarr;
     int numscreens;
     screenarr = XineramaQueryScreens(disp, &numscreens);
+
     m_priv->m_rect = wxRect(screenarr[index].x_org, screenarr[index].y_org,
                             screenarr[index].width, screenarr[index].height);
     m_priv->m_depth = DefaultDepth(disp, DefaultScreen(disp));
@@ -262,8 +263,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 +283,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