Commit Graph

2103 Commits

Author SHA1 Message Date
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
Stefan Csomor
3f45b63e4d correct base for carbon is 10.6 max
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-25 08:36:54 +00:00
Stefan Csomor
0dd6bd1895 adding correct valid architectures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-25 08:28:43 +00:00
Stefan Csomor
4e4aacdf12 carbon sdk must be 10.7 max, 10.8 is not supported anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 19:05:28 +00:00
Stefan Csomor
68b9924c4e leave i386 compiler to default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 19:00:09 +00:00
Vadim Zeitlin
4132e6de41 Add webviewarchivehandler.cpp to manually maintained VC10 project file.
Closes #15427.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 14:33:33 +00:00
Vadim Zeitlin
6ce0ccf593 Fix DLL targets names in manually maintained VC10 project files.
This takes care of annoying warning about "target name does not match linker
output file name" when building the DLLs.

Closes #15435.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 14:33:16 +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
Vadim Zeitlin
e4c7db4552 Remove wxUniversal configuration from the MSVC 10 project files.
As these configurations are not present in the automatically generated files
any more, remove them from the manually created ones too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 15:27:51 +00:00
Vadim Zeitlin
591c850f68 Remove more exclusions from Inno Setup file.
Some excluded entries were not-existent anyhow (.cvsignore, wxPython, *.pch)
while others could be useful to have (misc).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:41 +00:00
Vadim Zeitlin
218e641ac2 Don't exclude tests from wxMSW-Setup.exe.
The tests are useful to have to be able to check some functionality.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:38 +00:00
Vadim Zeitlin
d136f2abf1 Exclude "osx" files, not "mac" ones, from Inno Setup file.
"mac" subdirectories don't exist any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:35 +00:00
Vadim Zeitlin
9bd7659972 Remove redundant lines from Inno Setup file.
We don't need to handle the documentation files separately when they are
already taken care of together with everything else anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:32 +00:00
Vadim Zeitlin
6dbc37ce70 Remove Inno Setup file dependency on c:\daily path.
Generate the output file in the parent of the sources directory and take care
of copying it to c:\daily in bld_chm_exe.bat itself.

This allows to use wxwidgets.iss without that batch file and also on systems
without c:\ drive at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:26 +00:00
Vadim Zeitlin
beee5d6863 Use "INNO" env var in Inno Setup script only if it's defined.
Just use the sources directory itself if %INNO% is not defined. In fact, I
think we could always use the source directory, actually, but just in case
there was some reason to do it like this, keep using %INNO% if it is defined.

Also check that WXW_VER environment variable that we use is, in fact, defined.

FIX: Use relative path, not %WXWIN% in ISS script.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:23 +00:00
Vadim Zeitlin
e86aa7a62c Add a test for eol-native file existence in the release script.
Otherwise it could silently create a distribution with the files with wrong
EOLs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:15 +00:00
Vadim Zeitlin
fa699cbaaf Make it possible to use svn-find-native-eols script without svn checkout.
This should make it simpler to use it for other people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:07 +00:00
Vadim Zeitlin
63fd12c735 Add manually created VC10 project and solution files for the library.
These files were obtained by importing the VC9 files and then setting up the
dependencies correctly in the solution. This is just a temporary solution and
we'll hopefully generate them with bakefile-1 for the 3.0 release but for now
this is better than nothing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-16 15:47:14 +00:00
Vadim Zeitlin
6ed612f498 Don't build tex2rtf and HelpGen utils in non-GUI buildbot builds.
Both of those are obsolete and don't exist in 2.9 any longer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-14 11:32:46 +00:00
Vadim Zeitlin
330d01ae47 Better fix for wxX11 linking problems than r74499.
Fix wxX11 without breaking wxGTK/Windows makefiles generation.

Closes #15327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 23:35:55 +00:00
Dimitri Schoolwerth
49e6c3d6cc Regenerated Xcode projects.
Updated the Xcode projects to include wakeuppipe.cpp.
Also fixes the wxiphone project which appeared to have 2 source file references concatenated (stattext.mm and slider.mm) since the last commit. This unfortunately happens sometimes when running makeprojects.applescript.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 21:59:26 +00:00
Vadim Zeitlin
5b608795d4 Use "MSW" and "Windows" more accurately to avoid confusion.
"MSW" is used as the name of toolkit using the standard Windows UI while
"Windows" is the name of the OS under which wxGTK can be now used too (in
addition to wxMSW).

This terminology is not perfect but at least let's keep it unambiguous.

Closes #15328.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 20:07:51 +00:00
Vadim Zeitlin
46ba8e87c7 Do include src/generic/animateg.cpp in wxUniv/X11 sources.
This fixes linking of the widgets sample when using wxUniv/X11.

It partially reverts the changes of r73290 which only included this file in
some selected ports instead of all of them for some reason.

Closes #15327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 13:03:09 +00:00
Vadim Zeitlin
20125017a4 Extract compiler-specific macro definitions in a new wx/compiler.h.
This solves the problem with wx/defs.h -> wx/platform.h -> wx/setup.h which
resolves to msvc/wx/setup.h -> wx/version.h -> wx/cpp.h include path which
resulted in __VISUALC__ not being defined in wx/cpp.h.

This problem was not new but went unnoticed for a long time and was only
discovered when wxCHECK_VISUALC_VERSION() started being used in wx/cpp.h too
as now the compiler started warning about wrong #if syntax due to it being
undefined.

Putting the compiler-specific definitions in a separate file allows this file
to be included from wx/cpp.h to ensure that these symbols are always defined
in it and also makes things a little better organized.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 02:30:21 +00:00