Add wxControlWithItems::SendSelectionChangedEvent() helper.

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

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index a6c294d5e2b81ea95aa42795bee98bb9f8a4278d..6f97e92717412602f475706e159ee1c8863383f5 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -62,9 +62,6 @@
         #include <X11/Xlibint.h>
 
         #include <X11/extensions/Xinerama.h>
-        #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
-            #include <X11/extensions/xf86vmode.h>
-        #endif
     }
 
     typedef XineramaScreenInfo ScreenInfo;
@@ -222,6 +219,8 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
 
 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
 
+#include <X11/extensions/xf86vmode.h>
+
 //
 //  See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more
 //  info about xf86 video mode extensions
@@ -383,7 +382,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
 
 #include "wx/utils.h"
 
-#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 || !defined(GDK_WINDOWING_X11)
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {