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

2126 Commits

Author SHA1 Message Date
Vadim Zeitlin
0811259c0d Add files included by richtext library to MSVC1{1,2} projects. 
Closes #16104.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-23 17:54:54 +00:00
Vadim Zeitlin
2d39af0bbe Use "MultiProcessorCompilation" instead of explicit /MP in MSVS projects. 
Use the user-visible option instead of the command line option which is now
hidden in the IDE.

Closes #16093.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-18 17:08:16 +00:00
Vadim Zeitlin
9be89b48db Install wx/preferences.h and wx/testing.h in "make install". 
These headers were accidentally forgotten in files.bkl, add them there and
rebake.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-13 16:15:28 +00:00
Vadim Zeitlin
54da844960 Update the version string in manually managed VC11 project files. 
Use "31", not "30".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-12 16:02:43 +00:00
Vadim Zeitlin
d6ace87b61 Upgrade included Scintilla to version 3.3.9. 
Closes #15742.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-12 13:23:54 +00:00
Vadim Zeitlin
13e571eb98 Remove non-existent wx/cairo.h from MSVC{11,12} projects. 
This file resulted in never ending rebuilds of the core project as MSVS tried
to recreate the missing dependency (and failed).

See http://blogs.msdn.com/b/andrewarnottms/archive/2012/06/07/enable-c-and-javascript-project-system-tracing.aspx
for help with debugging such problems in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-02 23:40:47 +00:00
Vadim Zeitlin
f4e2cffdce Enable debug information in release configuration of MSVC{11,12} projects. 
We want to generate debug information even in the release builds of the
libraries in order to allow debugging of the programs using them. This is
especially important for the DLLs but do it for the static release build too
for consistency.

This also almost fixes the constant rebuilding of the entire solution which
happened because the PDBs, supposed to be generated by linker, were not found
because they were not actually created as the debug information wasn't there.

See #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-02 23:40:41 +00:00
Vadim Zeitlin
dcdbd3c01c Add missing XRC handlers to the manual VC{11,12} projects. 
XRC handler in aui, ribbon and richtext libraries were omitted in the initial
versions of the projects for some reason.

See #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-02 23:40:32 +00:00
Vadim Zeitlin
fe93941fb2 Use settings in wx_vcN_local.props files if they exist. 
Allow overriding the default build settings in local properties files for VC11
and VC12 builds.

See #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-22 19:45:49 +00:00
Vadim Zeitlin
8587e491f9 Add projects for MSVC 11 and 12 (MSVS 2012 and 2013). 
Add manually created projects for now, as it looks that we are not going to
have bakefile-generated ones any time soon.

Closes #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-18 15:43:16 +00:00
Julian Smart
f95ee1bade Added ability to disable images in wxRTC for performance or image corruption reasons 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-13 12:32:46 +00:00
Vadim Zeitlin
892a8b47c4 Add XRC handler file to MSVC 10 project. 
Closes #15942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-04 16:40:04 +00:00
Vadim Zeitlin
202678e048 Add new XRC headers to the core project too. 
Closes #15942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-04 15:59:57 +00:00
Vadim Zeitlin
637d4a3837 Add xh_ribbon.cpp to MSVC 10 ribbon library project. 
Fix linking errors when using wxRibbonXmlHandler.

Closes #15927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-01-30 19:40:46 +00:00
Vadim Zeitlin
91bd95beb7 Allow building wxGTK using GTK+3 under Windows too. 
No real changes, just use the right libraries for GTK+3 port.

Closes #15871.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-01-10 14:18:54 +00:00
Vadim Zeitlin
93df189c11 Update the versions of the libraries built by wx_vc10.sln. 
Use "31" or "310" in the library names instead of "30".

Closes #15810.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-01-05 21:11:07 +00:00
Robin Dunn
6f25e45af1 Turn off wxUSE_COMPILER_TLS for wxPython builds to avoid crashes on XP. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-01-02 00:24:32 +00:00
Robin Dunn
37df5cf045 Guard against trying to use extend() with None 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-29 03:22:15 +00:00
Vadim Zeitlin
8bb6427f10 Remove wx/generic/colrdlgg.h from common GUI headers. 
This header is not used in all ports, notably not in wxMSW nor wxGTK.

See #15753.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-18 16:00:27 +00:00
Paul Cornett
f88b7c1b8f fix inconsistent line endings 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-15 02:07:14 +00:00
Vadim Zeitlin
674c3fffbb Don't build wxOSX/Cocoa twice in wxOSX buildbot. 
Both trunk builds were using Cocoa, change the one supposed to be Carbon to
use Carbon instead.

Also add Carbon stable branch build as this is probably even more important
than testing Carbon in the trunk.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-07 12:30:46 +00:00
Vadim Zeitlin
f269f868d7 Add XRC handler for wxAuiToolBar. 
Also add the demonstration of AUI handlers (this one and the existing one for
wxAuiNotebook) to the xrc sample.

See #15686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-23 00:34:55 +00:00
Vadim Zeitlin
76845041b7 More version change related changes to the generated files. 
Somehow not all files seem to have been regenerated after version.bkl change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-23 00:34:42 +00:00
Vadim Zeitlin
4de86c0b26 Update version to 3.1.0. 
And regenerate everything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-21 13:47:05 +00:00
Vadim Zeitlin
a3b7c1f549 Add xh_auinotbk.{h,cpp} to the manually maintained VC10 project files. 
This file existed in automatically generated projects but not this one.

Closes #15673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-16 23:37:49 +00:00
Vadim Zeitlin
09f15c1640 Update the branches to use in the buildbot builds. 
Stable branch is 3.0 now and not 2.8 any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-15 13:40:59 +00:00
Vadim Zeitlin
9b31387508 Merge the changes from 3.0 branch. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-12 18:06:37 +00:00
Vadim Zeitlin
2f67c4ae07 Make windres command used in MinGW build configurable. 
This allows to pass extra arguments to windres, which is especially important
when using 64 bit windres for building 32 bit applications as the generated .o
file uses a wrong architecture unless "-F pe-i386" is explicitly specified.

See #15601.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-26 20:29:57 +00:00
Stefan Csomor
4e3d5fbd30 adding web view files for building Xcode projects, fixes #15590 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-18 08:44:03 +00:00
Stefan Csomor
49a5dcf924 adding web view files for building Xcode projects, see #15590 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-18 08:43:25 +00:00
Vadim Zeitlin
c5a00fab56 Update the version in bakefile presets to 3.0 too. 
Also mention this file in the list of files to update when changing the
version.

Closes #15577.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-13 10:30:13 +00:00
Vadim Zeitlin
daa65c025e Revert the change to wxGTK build slave configure arguments. 
Undo the temporary change of r74975 as it didn't help with fixing the problem
with the failing unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-09 19:44:42 +00:00
Vadim Zeitlin
7258ccc968 Change wxGTK build slave configuration to use built-in libpng. 
This is an attempt to debug the failure of ImageTestCase::ScaleCompare() unit
test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-09 10:34:24 +00:00
Dimitri Schoolwerth
b2e8c6508f Regenerated Xcode projects. 
Updated the Xcode projects to include src/common/threadinfo.cpp.

Closes #15558.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-08 02:17:50 +00:00
Vadim Zeitlin
0102c3b103 Don't use capital "H" in the header archives names. 
This is inconsistent with "docs" and is just strange.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-07 13:01:34 +00:00
Vadim Zeitlin
15a1c3b2ef Work around g++ atomic builtins detection in configure when -Os is used. 
Assigning __sync_sub_and_fetch() result to an unused variable can result in it
being optimized away and the function support is then not really tested for,
see #4542. So do make sure this variable is kept by making it volatile.

Closes #15555.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-04 23:48:22 +00:00
Vadim Zeitlin
9ed99f82da Remove support for Gnome printing from wxGTK. 
It was replaced by GTK+ printing several years ago and is almost never used
any longer anyhow, so any problems in this code (and there are some) would
never be found and fixed.

Also update the message catalogs to avoid having the strings not used any
more, as they were only used in Gnome printing code.

Closes #15517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 17:09:02 +00:00
Vadim Zeitlin
c136209446 Remove unused debian subdirectory. 
All Debian-based distributions use their own files for creating their
packages, so get rid of our own "debian" subdirectory to avoid confusing
people and to not have to maintain them any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 16:08:50 +00:00
Vadim Zeitlin
1828600933 Remove RPM .spec files from the repository. 
They were not really used for anything but still had to be updated and
maintained.

Get rid of them as all RPM-based distributions use their own spec files
anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 16:08:44 +00:00
Vadim Zeitlin
feafb8119e Define _CRT_NONSTDC_NO_WARNINGS for zlib compilation with MSVC. 
This avoids a bunch of harmless but annoying warnings due to the use of POSIX
functions in zlib code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 16:08:33 +00:00
Vadim Zeitlin
772513d824 Upgrade bundled zlib to 1.2.8. 
No real changes from wxWidgets point of view.

Closes #15314.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 16:08:25 +00:00
Václav Slavík
92c0fc34c1 Make storing non-trivial data in wxThreadSpecificInfo possible. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-18 16:03:14 +00:00
Steve Lamerton
632c86a3e6 Update vc10 build file versions to 3.0.0. 
See r74781.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-18 15:12:34 +00:00
Vadim Zeitlin
b0ad146aba Fix assorted typos in comments and other non-code. 
Closes #15509.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-17 15:25:59 +00:00
Vadim Zeitlin
e7bdf0ac8d Change version to 3.0.0. 
Keep "RC1" in the version string for now, but otherwise all version numbers
should be updated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-11 01:46:08 +00:00
Vadim Zeitlin
f83a9705cd Fix configure on GNU Hurd. 
Closes #15480.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-10 12:12:47 +00:00
Václav Slavík
c80d4c1e20 Add wxWindowPtr smart pointer. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-06 17:09:16 +00:00
Vadim Zeitlin
588135982a Restore correct wx-config creation and work around MinGW lack of symlinks. 
This undoes the changes of r72205 and r72249 (see #14517) as using relative
paths for wx-config symlink didn't work correctly if non-default values for
$bindir and/or $libdir were used (i.e. if they were not siblings).

Instead, fix the original problem of lack of symlinks when using MinGW
directly: just use "cp -p" if "ln -s" fails. This should work everywhere and
do the right thing.

Closes #15463.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-04 00:14:42 +00:00
Vadim Zeitlin
81f3129f77 Explicitly specify target names for all configurations in VC10 projects. 
The target names were not specified for the "Release" configuration in some
projects, resulting in (harmless, but annoying) warnings during the build.

Closes #15439.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-08-27 22:49:38 +00:00
Vadim Zeitlin
9e2e5d0759 Use $(OutDir) instead of explicit directories in VC10 project files. 
This makes it simpler to use a different output directory as it only needs to
be changed in one place.

See #15439.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-08-27 22:49:34 +00:00