Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,751 Commits 1 Branch 330 Tags
c1fdc717aedf3bab8b51a53ecd7f8d64cb028f60
Commit Graph

184 Commits

Author SHA1 Message Date
Vadim Zeitlin
9be6a3ddea Merge branch 'cmake-fixes' of https://github.com/MaartenBent/wxWidgets 
Miscellaneous fixes to CMake build system: fix some warnings, make it
more consistent with configure and more.

See https://github.com/wxWidgets/wxWidgets/pull/1430

See #18438.
 2019-07-19 23:43:23 +02:00
Maarten Bent
7f5ca2a4cb CMake: Fix detecting AppleClang 
Policies are now correctly initialized (before creating the project).
Policy CMP0025 changes the compilerID of Clang on Apple, handle this correctly.
 2019-07-19 21:13:04 +02:00
Maarten Bent
60b0a1fde2 CMake: Fix MSVC warning when using NMake 
Fix warning: Command line warning D9025 : overriding '/W3' with '/W4'
Remove /W3, either via a regex or via new policy CMP0092 (CMake 3.15).

The policy has to be set before calling project(), otherwise the
CMAKE_<LANG>_FLAGS are already initialized.

See https://trac.wxwidgets.org/ticket/18438
 2019-07-19 01:09:36 +02:00
Maarten Bent
181a03fc73 CMake: Only use -fno-rtti for C++ 
Using it for C generates the following warning:
command line option '-fno-rtti' is valid for C++/D/ObjC++ but not for C
 2019-07-19 01:09:36 +02:00
Olly Betts
b3ef78124c Remove the flash sample 
Adobe have announced the official EOL for flash is 2020 so we're
now at the point where support for flash just isn't interesting
any more.

It doesn't make sense to support it for the upcoming 3.2.x release
series, and the sample .swf files are lacking source code.

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

Closes #15886.
 2019-07-18 17:48:23 +02:00
Maarten Bent
5bf5581dbe CMake: Disable finding X11 session manager by default 
This is the same behaviour as configure has.
 2019-07-16 22:58:48 +02:00
Deamhan
0be2d94189 CMake: add an option for using preferred release build flags 
Add wxUSE_OPTIMISE build option.

See #18436.

Closes https://github.com/wxWidgets/wxWidgets/pull/1399
 2019-07-16 18:34:57 +02:00
Vadim Zeitlin
c219b53a2d Merge branch 'cmake-gcc-static' of https://github.com/Deamhan/wxWidgets 
Add support for using static CRT libraries with gcc to CMake build.

See https://github.com/wxWidgets/wxWidgets/pull/1398
 2019-07-16 18:25:52 +02:00
Deamhan
7c8d5dd36d CMake: -Wl,--exclude-libs=ALL has been removed for MinGW 2019-07-16 08:24:24 +03:00
Deamhan
f4a0ac93e3 CMake: wxUSE_VISIBILITY is non windows option now & -Wl,--exclude-libs=ALL has been added in MinGW case. 2019-07-15 19:13:58 +03:00
pk
1d52cf1d2d CMake: some cleanup 2019-07-15 11:05:43 +03:00
Deamhan
7be4d12749 CMake: pthread symbols has been removed from export (MinGW) 2019-07-15 00:10:45 +03:00
Deamhan
82dfc62a62 CMake: multiple definition issue (MinGW) has been fixed 2019-07-14 23:58:09 +03:00
Deamhan
242ecbb185 Update build/cmake/options.cmake 
Co-Authored-By: Maarten <MaartenBent@users.noreply.github.com>
 2019-07-13 18:51:19 +03:00
Deamhan
b92c30191c CMake: Add wxUSE_NO_RTTI option 
This is similar to configure --enable-no_rtti option.

Closes https://github.com/wxWidgets/wxWidgets/pull/1405
 2019-07-13 16:57:51 +02:00
Deamhan
59245dd232 CMake: Don't use /EHa for MSVS 
This is unnecessary and may result in worse performance for the
generated code.

Closes #18436.

Closes https://github.com/wxWidgets/wxWidgets/pull/1396
 2019-07-13 16:23:11 +02:00
Deamhan
fbac773fed CMake: MATCH -> STREQUAL for clang 2019-07-13 00:40:01 +03:00
Deamhan
4742c32c75 CMake: wxBUILD_USE_STATIC_RUNTIME was enabled for clang 2019-07-13 00:29:18 +03:00
pk
b93fce30f3 CMake: CMAKE_COMPILER_IS_GNUCC has been replaced 2019-07-11 12:01:38 +03:00
Deamhan
e0ad857a2d CMake: MinGW multiple definition issue has been fixed (wxBUILD_USE_STATIC_RUNTIME) 2019-07-10 11:30:31 +03:00
Deamhan
afcec3eefc CMake: wxBUILD_USE_STATIC_RUNTIME is available for GCC now 2019-07-09 17:48:59 +03:00
Vadim Zeitlin
32e3846e27 Remove private headers from the public headers list 
Private headers should not be installed and so must not be included in
the HDR variables in the file lists.
 2019-06-29 20:49:47 +02:00
Vadim Zeitlin
44634cbf90 Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt-fixes 
See https://github.com/wxWidgets/wxWidgets/pull/1225
 2019-06-29 20:49:25 +02:00
Anton Triest
584e2715eb Add XRC handlers for wxDataViewCtrl and related classes 
The same handler is also used for wxDataViewListCtrl and
wxDataViewTreeCtrl.

Closes #18424.
 2019-06-27 12:39:53 +02:00
Maarten Bent
9732a2d99f CMake: Allow to toggle between static and dynamic MSVC runtime 
After enabling wxBUILD_USE_STATIC_RUNTIME it cannot be disabled again
(except by manually modifying CMAKE_C*_FLAGS_*). Improve this by setting
the build flags to their default value when wxBUILD_USE_STATIC_RUNTIME
is disabled.

Closes https://github.com/wxWidgets/wxWidgets/pull/1338
 2019-06-07 16:39:16 +02:00
Matthew Griffin
77d5d31690 Close the Tree Control editor correctly 
Ensure that wxTreeItemData is deleted.
Use a QT delegate to create editor and perform custom model update.
Connect to the closeEditor signal to send out end label edit events and decide whether to accept changes.
 2019-05-30 10:47:09 +01:00
Vadim Zeitlin
02adddfa1a Merge branch 'wxlistctrl-virtual-checkboxes' of https://github.com/MaartenBent/wxWidgets 
Add support for checkboxes to virtual wxListCtrl too.

See https://github.com/wxWidgets/wxWidgets/pull/1315
 2019-05-10 01:39:33 +02:00
NikitaFeodonit
910aaa3961 Fix include directories for built-in libraries in CMake build 
This fixes ''wx/setup.h' file not found' error in CMake macOS build.

Closes https://github.com/wxWidgets/wxWidgets/pull/1314
 2019-05-10 01:37:26 +02:00
Maarten Bent
d262aa02d1 Remove obsolete wxOSX/Carbon listctrl header 2019-05-04 15:03:20 +02:00
New Pagodi
5f39bb4157 Update other test build files by hand for the new STC test 2019-03-20 17:07:56 -05:00
New Pagodi
f2e1aa46fe Modify build system files to use PlatWXcocoa.mm 
A recent commit added the file src/stc/PlatWXcocoa.mm needed for wxSTC
with the cocoa port. This commit modifies the build system files to
use this new file when it is needed.
 2019-03-20 00:12:41 -05:00
Graham Dawes
cfe36f7ae7 Move wxQtTreeItemEditorFactory to its own header 2019-02-06 08:57:29 +00:00
Graham Dawes
308ef18a6d Start "native" implementation of wxTreeCtrl for wxQT 2019-02-05 13:23:12 +00:00
Maarten Bent
6be0e7749c CMake: don't search SDL on macOS 
It doesn't compile when enabled.
 2019-02-03 19:01:00 +01:00
Tomay
8deb2cf0bb Add wxUSE_WINSOCK2 wxMSW option to include winsock2.h 
Including <winsock.h> and <winsock2.h> is incompatible and if the
application wants to use the latter, it may be convenient to define
wxUSE_WINSOCK2 when building wxWidgets instead of having to work around
winsock.h implicit inclusion from include/wx/msw/wrapwin.h.

Closes https://github.com/wxWidgets/wxWidgets/pull/1122
 2019-01-28 00:34:34 +01:00
NikitaFeodonit
537564ae19 CMake: use the target property OUTPUT_NAME instead of LOCATION in wx_get_dependencies 2019-01-21 18:19:39 +03:00
NikitaFeodonit
ad9175d79b CMake: wx-config can not be used to connect the libraries with the debug suffix, remove 'd' suffix for the UNIX build in wx_set_target_properties 2019-01-21 13:47:15 +03:00
NikitaFeodonit
1bc43c8d7a CMake: in wx_get_dependencies, for existing targets, use its LOCATION instead of the target name 2019-01-21 13:46:24 +03:00
NikitaFeodonit
3510319048 CMake: add processing the C flags for wxBUILD_USE_STATIC_RUNTIME 2019-01-21 13:45:46 +03:00
Jay Nabonne
1d117b75f7 Add wxGraphicsContext implementation for wxQt 
Add graphics renderer using Qt classes and use it by default in wxQt
port under MSW.

Closes https://github.com/wxWidgets/wxWidgets/pull/1139
 2019-01-17 00:50:47 +01:00
Vadim Zeitlin
288d26598c Merge branch 'dvc-var-height' 
Optimize generic wxDataViewCtrl performance with variable line heights.

Closes https://github.com/wxWidgets/wxWidgets/pull/1053
 2019-01-16 01:25:06 +01:00
Maarten Bent
8555f4abb0 CMake: Fix wx-config library list with monolithic build 
Closes https://github.com/wxWidgets/wxWidgets/pull/1132
 2019-01-11 14:29:26 +01:00
Jeff Bland
2937369869 CMake: Fix monolithic build 
Monolithic build regressed with commit
815d288c4fedba044a9863c883d6dd9f53526668 "Set wx-config base, gui and
built libraries".

The code queries each possible target name and creates lists of the
valid targets. In the monolithic build, none of the normal target names
exist, so the list is empty. The empty list is then passed to STRIP,
causing cmake to fail due to not having enough arguments.

By quoting the STRIP params we can pass an empty argument and thus
prevent the error of not-enough arguments.

See https://github.com/wxWidgets/wxWidgets/pull/1100
 2018-12-25 18:50:06 +01:00
Maarten Bent
db4c983881 CMake: Add missing stc and wxscintilla compile flags 
This fixes absence of highlighting and folding in CMake builds.

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

Closes #18306.
 2018-12-23 15:21:13 +01:00
Vadim Zeitlin
b2cdd287bb Resolve change log conflict with master 
Reapply the change log change manually to master version of the file to
let the CI builds merge this branch automatically.
 2018-12-20 02:24:49 +01:00
Maarten Bent
c1013d9bfc CMake: Add more option validity checks 2018-12-12 21:28:01 +01:00
Maarten Bent
5348b4fa3b CMake: Improve layout of third party libraries summary 
Add more external libraries to the summary, like configure does.
 2018-12-12 21:28:00 +01:00
Maarten Bent
91b6305dcd CMake: Improve checking for external libraries 
Do not abort when libLZMA or libSecret can not be found, just show a warning.
Do not search for libSecret on macOS.
Disable libraries internally (not in cache) when not searching for them.
 2018-12-12 21:28:00 +01:00
Maarten Bent
042b17512e CMake: Check for libSDL only on Unix 2018-12-12 21:28:00 +01:00
Maarten Bent
b9d31dffc5 CMake: Improve finding Iconv 
Continue when Iconv can not be found.
Silence warnings when testing if second argument for iconv() is const.
Use correct include dir.
 2018-12-12 21:27:57 +01:00