Handle UBUNTU_MENUPROXY=0 as "not using global menu".

Although the correct way to disable the global menu bar under Ubuntu is to
set UBUNTU_MENUPROXY to an empty string, many guides on the web advise setting
it to "0", so handle this special case in wxApp::GTKIsUsingGlobalMenu() too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 7e07406519552f19f992052e8f7f43e222d6563e..3754531c01719eec088d7256fea9fee7700b4315 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -542,7 +542,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;