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