Move wxControl::GetCompositeControlsDefaultAttributes() from MSW to common.

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

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 7e0b469080a817de09325480ce98bdf8d0bdc6fb..db0f37b899e1ee09017abd1712c465e612ec51c3 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -326,7 +326,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2

 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {


@@ -341,7 +341,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *height = 396;
 }
 
         *height = 396;
 }
 

-#else // !wxUSE_LIBHILDON
+#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2

 
 #include "wx/log.h"
 
 
 #include "wx/log.h"