and now fixed USE_CONTEXT_MENU definition as well

[wxWidgets.git] / src / unix / displayx11.cpp

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 081a954c0201898c7ee5309131ba4dd0fe6d9527..08cf56f9f0742b404346dae439c44b04c6abe450 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -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