Don't test for key code being valid unnecessarily.

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 7e07406519552f19f992052e8f7f43e222d6563e..7aba0eab72bbd3bbf484c3e116d4bf32b5a62d1c 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -288,6 +288,10 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     if ( !wxAppBase::Initialize(argc_, argv_) )
         return false;
 
+    // disable Ubuntu "overlay scrollbar" until we figure out how to keep it
+    // from messing up our window contents when scrolling, see ticket #14871
+    wxSetEnv(wxS("LIBOVERLAY_SCROLLBAR"), wxS("0"));
+
 #if wxUSE_THREADS
     if (!g_thread_supported())
     {
@@ -542,7 +546,7 @@ bool wxApp::GTKIsUsingGlobalMenu()
         // XDG_CURRENT_DESKTOP env var being set to "Unity".
         wxString proxy;
         s_isUsingGlobalMenu = wxGetEnv("UBUNTU_MENUPROXY", &proxy) &&
-                                !proxy.empty();
+                                !proxy.empty() && proxy != "0";
     }
 
     return s_isUsingGlobalMenu == 1;