[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 9c17ef7d2815344597bbfc289bf7f46134297eb4..1d71c7f038d8238d98f9b2fc6e1ccae40230b325 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -21,22 +21,23 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_DISPLAY
+

 #include "wx/display.h"
 #include "wx/display.h"

-#include "wx/display_impl.h"
-#include "wx/intl.h"
-#include "wx/log.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-  #include "wx/dynarray.h"
-  #include "wx/gdicmn.h"
-  #include "wx/string.h"
-  #include "wx/utils.h"
+    #include "wx/dynarray.h"
+    #include "wx/gdicmn.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif /* WX_PRECOMP */
 
 #endif /* WX_PRECOMP */
 

-#if wxUSE_DISPLAY
+#include "wx/display_impl.h"

 
 /* These must be included after the wx files.  Otherwise the Data macro in
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */
 
 /* These must be included after the wx files.  Otherwise the Data macro in
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */


@@ -107,7 +108,7 @@ private:
 class wxDisplayFactoryX11 : public wxDisplayFactory
 {
 public:
 class wxDisplayFactoryX11 : public wxDisplayFactory
 {
 public:

-    wxDisplayFactoryX11();
+    wxDisplayFactoryX11() { }

 
     virtual wxDisplayImpl *CreateDisplay(size_t n);
     virtual size_t GetCount();
 
     virtual wxDisplayImpl *CreateDisplay(size_t n);
     virtual size_t GetCount();