Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WX_WEB_EXTENSIONS_DIRECTORY define

Browse Source 
wxWidgets already has a mechanism for locating plugins under
$libdir/wx/*, there's no reason to duplicate it with another
compile-time symbol.

As a consequence, this makes the library relocatable via WXPREFIX again.
This commit is contained in:
Václav Slavík
2020-10-05 16:54:07 +02:00
parent 737e9be2d0
commit 40e5152cfc
8 changed files with 33 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk/webview_webkit2.cpp
View File

@@ -369,7 +369,7 @@ wxgtk_webview_webkit_counted_matches(WebKitFindController *,
}
// This function checks if the specified directory contains our web extension.
static bool CheckDirectoryForWebExt(const char* dirname)
static bool CheckDirectoryForWebExt(const wxString& dirname)
{
wxDir dir;
if ( !wxDir::Exists(dirname) || !dir.Open(dirname) )
@@ -409,33 +409,38 @@ wxgtk_initialize_web_extensions(WebKitWebContext *context,
// The first value is the location in which the extension is supposed to be
// normally installed, while the other three are used as fallbacks to allow
// running the tests and sample using wxWebView before installing it.
const char* const directories[] =
wxString normalLocation = wxDynamicLibrary::GetPluginsDirectory();
if ( !normalLocation.empty() )
normalLocation += "/web-extensions";
wxString const directories[] =
{
WX_WEB_EXTENSIONS_DIRECTORY,
normalLocation,
"..",
"../..",
"lib",
};
const char* dir = NULL;
wxString dir;
for ( size_t n = 0; n < WXSIZEOF(directories); ++n )
{
if ( CheckDirectoryForWebExt(directories[n]) )
if ( !directories[n].empty() && CheckDirectoryForWebExt(directories[n]) )
{
dir = directories[n];
break;
}
}
if ( dir )
if ( !dir.empty() )
{
webkit_web_context_set_web_extensions_directory(context, dir);
webkit_web_context_set_web_extensions_directory(context, dir.utf8_str());
}
else
{
wxLogWarning(_("Web extension not found in \"%s\", "
"some wxWebView functionality will be not available"),
WX_WEB_EXTENSIONS_DIRECTORY);
directories[0]);
}
webkit_web_context_set_web_extensions_initialization_user_data(context,