cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,360 Commits 1 Branch 0 Tags 333 MiB
b825c49c2e
Commit Graph

2608 Commits

Author SHA1 Message Date
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
251561172a Remove mentions of non-existent docs/$toolkit/install.txt 
Don't include these files in "make dist" (which seems completely unused
anyhow, and probably broken because of this).
 2018-12-10 19:06:18 +01:00
Vadim Zeitlin
e1185d8bf0 Increment version number to 3.1.3 
Done by running misc/scripts/inc_release, manually updating version.bkl,
rebaking and rerunning autoconf.
 2018-12-10 19:06:18 +01:00
Vadim Zeitlin
b8f791877e Fix SHA-1 update script to work with the current release.md 
Change the regex used to find the lines to update to actually find them.
 2018-12-09 16:52:40 +01:00
Vadim Zeitlin
2b612603d3 Give an error from build/tools/post-release.sh if it didn't work 
The script gave a misleading success message even if it didn't find
anything to update.
 2018-12-09 16:51:29 +01:00
Vadim Zeitlin
f456f52493 Add a text file to be shown after finishing wxMSW installation 
We used docs/msw/install.txt for this previously, but it was too long to
be comfortably viewed in the installation wizard and also incidentally
doesn't exist any more, so add a new, short file just referring the user
to its replacement.
 2018-12-09 16:40:08 +01:00
Vadim Zeitlin
653f9b14f0 Don't reference inexistent docs/msw/install.txt in wxwidgets.iss 
Use install.md which is probably not ideal, but it at least allows Inno
Setup to successfully build the installer.
 2018-12-09 16:18:06 +01:00
Vadim Zeitlin
a18fc6ce96 Normalize line endings in wxwidgets.iss 
This file was a mix of DOS and Unix EOLs, convert it entirely to the
former.

No real changes.
 2018-12-09 16:10:51 +01:00
Maarten Bent
28a13209a2 CMake: Compile and link with -pthread when using pthread 2018-12-06 23:22:33 +01:00
Maarten Bent
c28ae123c1 CMake: Set wx-config extra libraries and flags 2018-12-06 22:48:03 +01:00
Maarten Bent
12ed604cb3 CMake: Set wx-config name variables 2018-12-06 22:39:42 +01:00
Maarten Bent
33a550d97f CMake: Set wx-config base, gui and built libraries 
Remove unused propagated variables.
 2018-12-06 22:39:41 +01:00
Maarten Bent
bc4b56bf88 CMake: Reorder items in config.cmake 
Group similar items together.
 2018-12-06 22:39:41 +01:00
Maarten Bent
8cf2b683be CMake: Fix installation include directory 2018-12-06 22:39:41 +01:00
Maarten Bent
e984857b0e CMake: Improve webview checks 
Try to match behavior of configure.
Fix building webview sample with STC disabled.
 2018-12-03 00:20:38 +01:00
Maarten Bent
8192d507e3 CMake: Fix wx-config include dirs 2018-12-02 17:45:43 +01:00
Maarten Bent
c0544afcd7 CMake: Improve installation on Linux 
Install setup header, wx-config and wxrc. Make wx-config executable.
Add renamed files and symbolic links to uninstall target.
 2018-12-02 17:45:43 +01:00
Maarten Bent
c80aecbfc1 CMake: Put include and link commands on one line 
Use correct check for LIBICONV.
 2018-12-02 17:45:43 +01:00
Maarten Bent
29666f1d91 CMake: Fix wxscintilla with precompiled headers and clang 
The problem also occurs on Linux.
 2018-12-02 17:45:35 +01:00
Maarten Bent
5282f92f8f CMake: Silence OpenGL policy warning 2018-12-02 17:45:34 +01:00
Maarten Bent
271ed4d990 CMake: Support SDL audio back-end 
Rename UNIX_SOUND_SRC_SDL to UNIX_SOUND_SDL_SRC to match the
signature of other variables (ending with _HDR or _SRC).
 2018-12-02 17:45:32 +01:00
Maarten Bent
97f64e9941 CMake: Build the webextensions plugin 2018-12-02 03:23:02 +01:00
Maarten Bent
1c5cbe0a61 CMake: Add support for webkit2 2018-12-02 03:21:33 +01:00
Glen Fletcher
ae1fa08188 Add C++17 to the list of supported C++ Standards in CMake build 
Allow building with set(CMAKE_CXX_STANDARD 17).

Closes https://github.com/wxWidgets/wxWidgets/pull/1029
 2018-11-20 22:22:01 +01:00
Maarten Bent
c9318f2f64 Update vcxproj files with new tiff files 
Closes https://github.com/wxWidgets/wxWidgets/pull/1028
 2018-11-20 21:34:59 +01:00
Maarten Bent
660fbca82d CMake: Add include directories and libraries for all packages 
lzma.h could not be found when building with wxUSE_LIBLZMA on macOS. Add
the found include directories and libraries from find_package(LibLZMA)
to the base library.

For consistency, add the include directories and libraries of all
find_package usage.

Closes https://github.com/wxWidgets/wxWidgets/pull/1024
 2018-11-18 01:01:28 +01:00
Maarten Bent
ec4b71afa0 Update tiff submodule 
Add the new files to the build system. Disable support for webp and zstd
because we do not want to depend on external libraries.
 2018-11-17 19:08:40 +01:00
Stefan Csomor
edecb26899 adapting xcodeproj to generic imaglist.cpp 2018-11-14 12:06:36 +01:00
Vadim Zeitlin
cf980cf5e3 Merge branch 'cmake-gstreamer-d2d' of https://github.com/MaartenBent/wxWidgets 
CMake improvements: better gstreamer and Direct2D support.

See https://github.com/wxWidgets/wxWidgets/pull/1014
 2018-11-05 18:51:10 +01:00
Maarten Bent
de4eecc575 Install additional packages on Travis CI 
Install packages for gstreamer, webkit, opengl and libsecret.
First check if the package is available.
 2018-11-04 22:00:32 +01:00
Maarten Bent
e1e5169e4b CMake: enable Direct2D graphics context by default 
Disable it when the d2d1.h header is not found.
When using MSVC, match the behaviour of setup.h.
 2018-11-04 16:49:14 +01:00
Maarten Bent
5c4741430a CMake: move find_package for lzma and secretstore to init.cmake 2018-11-04 16:35:58 +01:00
Maarten Bent
e1b725d5be CMake: mark package variables as advanced 
Silence pkg_check_modules message.
 2018-11-04 16:35:58 +01:00
Maarten Bent
d293f94d95 CMake: improve finding gstreamer 
Support checking for multiple versions, first check gstreamer-1.0, then gstreamer-0.10.
Add support for finding gstreamer-player.
Specify the required components, add the include directories and link with the libraries of the found components.
Set the setup variables wxUSE_GSTREAMER and wxUSE_GSTREAMER_PLAYER.
 2018-11-04 16:35:57 +01:00
Vadim Zeitlin
c374eefd34 Fold wxOSX-specific wxImageList into generic version 
Get rid of wxOSX wxImageList implementation as it was 99% identical to
the generic version and the non-identical parts should really have been
made part of the generic version too from the beginning.

Notably, use GetScaled{Width,Height}() in Add() method in the generic
version too now.
 2018-10-30 16:28:07 +01:00
Vadim Zeitlin
8890a25db3 Merge branch 'setup-h-cmake' of https://github.com/MaartenBent/wxWidgets 
Fix issues with generating setup.h.in.

See https://github.com/wxWidgets/wxWidgets/pull/994
 2018-10-29 15:18:43 +01:00
Maarten Bent
f1cf525944 Add CMake option to set wxDEBUG_LEVEL 
It is no use adding it to the generated setup.h because this section is commented out,
so add it as compiler option instead.
The default option is 'Default' in which case no compiler option is added.
 2018-10-25 20:46:31 +02:00
Maarten Bent
a02bb61e90 Fix build errors after modifying CMake setup.h.in 
Always set a value to ICONV_CONST so it will be defined in setup.h.
Add a check for strtoull to prevent a macro redefined warning.
Link with WebKit framework to fix macOS build with wxUSE_WEBKIT.
 2018-10-25 20:46:31 +02:00
Maarten Bent
6363db488f Make CMake setup.h.in an exact copy of setup.h.in 
Except use cmakedefine and cmakedefine01 to declare the variables.
 2018-10-25 20:46:31 +02:00
Maarten Bent
828c3ce50d Remove duplicate line from update-setup-h 
It was intended to be update_osx_setup_h but resulting setup.h.in would not
work because the macOS options are not initialized by configure or CMake.
 2018-10-25 20:36:22 +02:00
Tobias Taschner
a52393267a
CMake: Enable highest warning level for MSVC 
This is not enabled for third party libaries as they are currently
producing too many warnings.
 2018-10-24 10:52:47 +02:00
Tim S
fd0017f669 Do build/upmake, bakefile_gen, and autoconf 2018-10-16 11:35:59 -04:00
Tim S
edc9eca2cc Move generic/activityindicator.{h,cpp} from MSW_LOWLEVEL_{HDR,SRC} to under MSW_{HDR,SRC} 2018-10-16 11:35:58 -04:00
Tim S
d9891c4aa1 Remove msw/evtloop.{h,cpp} from UNIV_PLATFORM_{HDR,SRC} 2018-10-16 11:35:58 -04:00
Tim S
09aa8c741e Move msw/evtloop.{h,cpp} from MSW_{HDR,SRC} to under MSW_LOWLEVEL_{HDR,SRC} 2018-10-16 11:35:58 -04:00
Maarten
a36868b391 CMake: only enable flash sample for MSVC 
Fixes a regression from 1dfe088b.

See https://github.com/wxWidgets/wxWidgets/pull/974
 2018-10-10 23:53:38 +02:00
Vadim Zeitlin
e0ba727dec Extract X11 functions used by wxGTK in a separate header 
This makes src/unix/displayx11.cpp almost readable as it's not littered
by "#ifndef __WXGTK20__" checks everywhere any more -- instead this file
is just not compiled as part of wxGTK2 at all any longer (it is still
included in wxGTK1 as well as wxX11 itself and wxMotif).

wxGTK code also can just include the new wx/unix/private/displayx11.h
instead of having to declare all the X11 functions it uses manually.

There should be no changes in behaviour, this is just a clean up.
 2018-10-04 17:07:11 +02:00
Vadim Zeitlin
f4c7a31414 Merge branch 'qt-ownerdrawn-fix' of https://github.com/MaartenBent/wxWidgets 
See https://github.com/wxWidgets/wxWidgets/pull/957
 2018-10-03 14:44:10 +02:00
Tobias Taschner
dd9ef9e588 Select latest Windows 10 SDK when building with MSVS 2017 
Unfortunately Visual Studio 2017 defaults to Windows SDK 8.1
which is not installed with it. This workaround automatically
targets the latest Windows 10 SDK when building.

Closes https://github.com/wxWidgets/wxWidgets/pull/959

Closes #18078.
 2018-10-03 14:43:39 +02:00
Maarten Bent
519d8fec8a Disable wxUSE_OWNER_DRAWN when using WXQT with CMake 2018-10-01 21:43:19 +02:00