|
 |
cb22fbe |
From 79676e1e9d307c479c5aefa70c0fd052341d697e Mon Sep 17 00:00:00 2001
|
|
|
cb22fbe |
From: Vadim Zeitlin <vadim@wxwidgets.org>
|
|
|
cb22fbe |
Date: Mon, 24 Aug 2015 17:18:15 +0200
|
|
|
cb22fbe |
Subject: [PATCH] Fix wxGTK build after wxLaunchDefaultBrowser() fix backport.
|
|
|
cb22fbe |
|
|
|
cb22fbe |
2dd407609b8987634180c045e9a6d131db6f947e uses wxGetTopLevelGDK() only
|
|
|
cb22fbe |
available in master and not in 3.0 branch, avoid it by just using the default
|
|
|
cb22fbe |
screen (which also avoids having to add another GTK+ version check for
|
|
|
cb22fbe |
gdk_window_get_screen() which is only available since 2.24).
|
|
|
cb22fbe |
---
|
|
|
cb22fbe |
src/unix/utilsx11.cpp | 3 +--
|
|
|
cb22fbe |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
cb22fbe |
|
|
|
cb22fbe |
diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
|
|
|
cb22fbe |
index 7d5811a..6b35551 100644
|
|
|
cb22fbe |
--- a/src/unix/utilsx11.cpp
|
|
|
cb22fbe |
+++ b/src/unix/utilsx11.cpp
|
|
|
cb22fbe |
@@ -894,8 +894,7 @@ bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
|
|
|
cb22fbe |
if (gtk_check_version(2,14,0) == NULL)
|
|
|
cb22fbe |
#endif
|
|
|
cb22fbe |
{
|
|
|
cb22fbe |
- GdkScreen* screen = gdk_window_get_screen(wxGetTopLevelGDK());
|
|
|
cb22fbe |
- if (gtk_show_uri(screen, url.utf8_str(), GDK_CURRENT_TIME, NULL))
|
|
|
cb22fbe |
+ if (gtk_show_uri(NULL, url.utf8_str(), GDK_CURRENT_TIME, NULL))
|
|
|
cb22fbe |
return true;
|
|
|
cb22fbe |
}
|
|
|
cb22fbe |
#endif // GTK_CHECK_VERSION(2,14,0)
|