X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5027818a42043052ac375b1a0ba30fac491ddc4..14722c43c30918cd8fbba956b50ac3426d2fe339:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 318952f62b..823da625a2 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -26,7 +26,6 @@ #include #endif -#include "wx/gtk/private.h" #include "wx/apptrait.h" #include "wx/fontmap.h" @@ -38,9 +37,8 @@ #include #endif // wxUSE_LIBHILDON2 -#ifdef GDK_WINDOWING_X11 -#include -#endif +#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // link GnomeVFS @@ -231,6 +229,7 @@ bool wxApp::OnInitGui() if ( !wxAppBase::OnInitGui() ) return false; +#ifndef __WXGTK3__ // if this is a wxGLApp (derived from wxApp), and we've already // chosen a specific visual, then derive the GdkVisual from that if ( GetXVisualInfo() ) @@ -268,6 +267,7 @@ bool wxApp::OnInitGui() } } } +#endif #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 if ( !GetHildonProgram() )