Commit Graph

69 Commits

Author SHA1 Message Date
Maarten Bent
ae695b8b57 Add wxWebViewEdge includes to monolithic builds too
Create a template with the additional webview includes and defines needed for Edge backend.
Use the template in the lib, dll, and monolithic build.

Fixes #19104
2022-05-20 00:17:30 +02:00
Tobias Taschner
57ebad4f7d
Allow usage of static loader with wxWebViewEdge
Add a new build option wxUSE_WEBVIEW_EDGE_STATIC.
If it is set to 1 the WebView2 loader is static linked into the binary
and removes the runtime dependency on WebView2Loader.dll.
2022-02-07 22:49:33 +01:00
Arrigo Marchiori
30915c6163 Make wxrc independent from GUI support
The wxrc program does not depend on the GUI libraries, but only on
the base and XML libraries, so make it possible to build it in non-GUI
builds too.

Closes https://github.com/wxWidgets/wxWidgets/pull/2419
2021-08-06 21:51:11 +02:00
Maarten Bent
272c903234 Silence unknown pragmas warning in the WebView2 header
Using wxGCC_WARNING_SUPPRESS(unknown-pragmas) around the webview2 header does
not work, so suppress it for the entire webview project.
2021-03-01 00:09:23 +01:00
Maarten Bent
09bc566b60 Support building wxWebViewEdge with GCC or Clang
Add EventToken.h with EventRegistrationToken implementation, that can be used by the WebView2 header.
2021-03-01 00:09:23 +01:00
Vadim Zeitlin
a2a409f7a5 Remove references to non-existent wxWebRequest headers
Remove the platform-specific wxWebRequest headers from the files lists
and from MSVS 200x project files.

This should have been done in e5bd5a926c (Move backend-specific
wxWebRequest headers to private subdirs, 2020-12-26) manually, as
update-setup-h script doesn't remove the old files from the variable
definitions.

It notably fixes CMake build under MSW and Mac, which failed due to not
finding the referenced files.
2020-12-30 14:36:06 +01:00
Václav Slavík
40e5152cfc Remove WX_WEB_EXTENSIONS_DIRECTORY define
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.
2020-10-05 16:54:16 +02:00
wangqr
f730da3c14 Add imm32.lib to wxStyledTextCtrl 2020-05-11 00:37:56 -04:00
Tobias Taschner
f2196abca3
Add wxWebViewEdgeChromium to other build systems 2020-01-10 22:22:30 +01:00
Vadim Zeitlin
8ec8a0cf66 Define WX_WEB_EXTENSIONS_DIRECTORY in static builds too
This definition is needed when building both shared and static webview
library when using WebKit 2, but for some reason wasn't included for the
latter.

Closes https://github.com/wxWidgets/wxWidgets/pull/1061
2018-12-10 19:31:40 +01:00
Vadim Zeitlin
0225f191e8 Replace PLUGIN_ADV_SRC to PLUGIN_SRC and put them into "core"
wxSound SDL plugin should be in "core" too, when linking the plugins
statically, rather than in "adv", now that wxSound itself is in core.
2018-09-02 23:36:41 +02:00
Vadim Zeitlin
3ffa651a34 Move wxAdv library contents into wxCore
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
2018-08-27 21:13:04 +02:00
Scott Talbert
42964879bc Fix building with WebKit2GTK+
After 2893f894, the extension define quotes need to be escaped.  Additionally,
this fixes monolithic and non-shared builds with WebKit2GTK+.
2017-06-05 23:34:18 -04:00
Vadim Zeitlin
2893f894ab Limit the use of "webkit2_ext" to autoconf only in bakefiles
This is used by WebKit2 backend under Unix with configure, but is not needed
under the other platforms and prevented bakefile_gen from generating all
output files due to the of undefined USE_WEBVIEW_WEBKIT2 variable.

We could define it for formats other than autoconf, but this doesn't seem to
be useful currently, so just avoid referencing it instead.

Closes #17860.
2017-05-15 23:40:08 +02:00
Scott Talbert
cbe0a1f049 Add support for WebKit2GTK+ in wxWebView 2017-04-22 20:00:48 +01:00
Vadim Zeitlin
d24f711f88 Only link webview library with libwebkitgtk in wxGTK, not the core one.
Add EXTRALIBS_WEBVIEW similar to the existing EXTRALIBS_MEDIA and such and set
it in configure instead of adding libwebkitgtk and dependent libraries
directly to GUI_TK_LIBRARY.

This ensure that the core library doesn't have any dependencies on
libwebkitgtk which it doesn't need.

Closes #16624.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-16 13:33:08 +00:00
Vadim Zeitlin
f4b80e5337 Remove MSVC6 support.
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 22:32:17 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Steve Lamerton
467d261e9d Rename web library to webview.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 10:45:16 +00:00
Steve Lamerton
384b8d9f3d Various typos fixes and minor build system changes. After a rebake wxMSW should now compile, although without any functionality.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 13:01:54 +00:00
Steve Lamerton
cfcf1d6ee3 Application of the most recent wxWebView patch, the only changes were so tab to space conversions. Please note this probably won't compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 15:40:00 +00:00
Vadim Zeitlin
1ba904fea1 No real changes in makefile but avoid repetitious in bakefile.
Collect all preprocessor options needed for Scintilla compilation in
wxscintilla_cppflags template and use for both Scintilla compilation itself
and for the wx libraries using it.

The order of flags in the makefiles has changed but they are still the same
except for Borland makefile which now includes Borland-specific warning
suppression option everywhere it's needed and not just in multilib targets.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:57 +00:00
Peter Cawley
3c3ead1d15 Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-16 12:06:02 +00:00
Vadim Zeitlin
1c4293cb91 added wxPropertyGrid from Jaakko Salli (#9934)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-12 20:57:41 +00:00
Václav Slavík
2f8711edd0 removed gstreamer dependency from all libraries except for wxMedia, not only from wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-20 22:35:40 +00:00
Vadim Zeitlin
1e6b2edfc8 remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 13:40:27 +00:00
Robin Dunn
54429bb380 Bakefile and other changes for new locations of STC and wxSVGFileDC.
Remove old files in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 06:27:23 +00:00
Václav Slavík
e80118cfb9 added makefile targets for building individual libs, e.g. 'make wxnet'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-19 16:12:19 +00:00
Václav Slavík
47b6ebde09 allow building wxXRC with wxUSE_HTML=0: make linking work in absence of wxHTML library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-22 13:07:27 +00:00
Mart Raudsepp
8ce1206e96 Remove wxHtml and wxXml dependency from wxAdv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-02 18:28:13 +00:00
Robin Dunn
a3f6a2cd3a The richtext DLL needs to also link with the html and xml DLLs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 17:22:02 +00:00
Julian Smart
c69f98840b Typo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 07:50:32 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 07:16:39 +00:00
Julian Smart
50acee04cd Initial commit of wxAUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-06 13:12:07 +00:00
Vadim Zeitlin
557002cf81 Ryan's cumulative wxActiveX and media control patch (1427775)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:37:40 +00:00
Michael Wetherell
4383e2b12a Adv now depends on libs xml and html, so add <library> tags for these and
bakefile takes care of everything.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 16:18:45 +00:00
David Elliott
4ebd02e913 qadll depends on coredll. First part of OS X shared library build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-27 01:51:36 +00:00
Vadim Zeitlin
61639efb66 added qa library (currently consisting of wxDebugReport and related classes only); moved debugrpt.* files there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-21 00:11:06 +00:00
Włodzimierz Skiba
0bcf9597ab Fixes for USE_GUI=0 to make pure wxBase makefiles possible. Nothing rebaked because GUI builds are not influenced (but makefiles minimally changed).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 08:14:18 +00:00
Ryan Norton
39c5bef057 1) fix border styles in wxMediaCtrl, 2) regenerate wx and mediaplayer samples bakefiles, 3) add sample makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 09:32:49 +00:00
Ryan Norton
2ae3b602b1 media lib bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:30:21 +00:00
Václav Slavík
3849327bce moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 18:41:19 +00:00
Václav Slavík
af594ecaf1 added support for building eVC projects (not yet tested)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 20:20:57 +00:00
Václav Slavík
c79241a238 changes to make building plugins possible; build wxSound SDL plugin on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:31:54 +00:00
Václav Slavík
c839485c8e added .chm support for Unix (Markus Sinner)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 19:47:02 +00:00
Václav Slavík
9698d2445d copy setup.h in every VC++ project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 21:40:47 +00:00
Václav Slavík
e2281645f2 minor fix (no real effect)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 09:41:23 +00:00
Václav Slavík
eb69fda554 ODBC library is built when wxUSE_GUI=0, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 19:54:59 +00:00
Václav Slavík
7bd54b688e 1. merged dll and lib VC++ projects into one project file, as in old projects
2. removed dependencies on 3rd party libs for static libs (doesn't work due to bug in VC++ IDE)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 21:22:50 +00:00
Václav Slavík
4fd0fc66a7 fix static wxnet build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 21:32:54 +00:00