Commit Graph

2344 Commits

Author SHA1 Message Date
Stefan Csomor
bcb75de8aa updated files without glgrab
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-09 20:23:36 +00:00
Stefan Csomor
808bf597df updated files without glgrab
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-09 20:16:35 +00:00
Stefan Csomor
c761631a3b updated files without glgrab
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-09 18:50:37 +00:00
Vadim Zeitlin
afdb989e87 Link wxMSW with msimg32.lib now that AlphaBlend() is used statically.
Implicitly link msimg32.lib in when using MSVC and add it to MinGW (and
Borland) makefiles.

This should have been part of r77029.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-09 18:03:23 +00:00
Vadim Zeitlin
7e6515e1ad Remove the files remaining from project-specific MSVS solutions.
These files are not used any more since r77008, there is only wx_setup.props
now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-07 21:06:55 +00:00
Vadim Zeitlin
5f9bd3678f Add XRC handler for wxSimplebook.
Similar to wxNotebook but even simpler as wxSimplebook doesn't use images.

Also add wxSimplebook::Create() as the version inherited from wxBookCtrlBase
didn't _quite_ work: we need to add wxBK_TOP style to prevent asserts due to
unknown alignment in the base class when creating wxSimplebook.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-05 22:01:52 +00:00
Vadim Zeitlin
5575cc59c2 Remove wx/unix/execute.h from the master list of files too.
This should have been part of r76683.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-05 22:01:45 +00:00
Vadim Zeitlin
946fbf4d14 Use the same project files for all MSBuild-based MSVS versions.
Get rid of version-specific MSVS project files, we can reuse the same projects
for all MSBuild-based versions, i.e. 2010, 2011 and 2013.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-05 22:01:41 +00:00
Stefan Csomor
5d11b53ddb mediactrl for ios
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-15 19:52:32 +00:00
Stefan Csomor
4cbf03f4ec trying xcrun notation for sdk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 18:38:25 +00:00
Stefan Csomor
e144fe614c adding standard options for OS compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 16:27:01 +00:00
Stefan Csomor
7da8c0e080 trial build with special warnings ON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 13:57:44 +00:00
Vadim Zeitlin
de291b2be1 Shorten wxOSX builds labels.
Too long labels made some of the buildbot tables quite unreadable, so shorten
them to something more reasonable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 11:38:18 +00:00
Stefan Csomor
0515b6e30d adding separate trunk fir c++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 09:37:04 +00:00
Stefan Csomor
e8dc944da9 making choice of libcppunit explicit, no system installed version anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 14:21:14 +00:00
Stefan Csomor
121229b115 adding ios build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 14:58:10 +00:00
Stefan Csomor
dc80770bd3 reverting name changes, doesn't seem to get reflected w/o restart
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 08:10:21 +00:00
Stefan Csomor
ae559580b0 building trunk with libc++ adjusting cppunit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 08:02:46 +00:00
Stefan Csomor
b047233fe3 adding carbon option and sdk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:30:36 +00:00
Stefan Csomor
6fedbe036d typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:14:03 +00:00
Stefan Csomor
3c39de1e8a add sdk again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:08:08 +00:00
Stefan Csomor
fa424608e1 change quoting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:04:57 +00:00
Stefan Csomor
c9d5751812 change quoting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:03:27 +00:00
Stefan Csomor
a83ae40967 adding flags, LDFLAGS need architecture as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 19:00:08 +00:00
Stefan Csomor
bb976fe04e next try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:22:01 +00:00
Stefan Csomor
823606f42e next try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:21:02 +00:00
Stefan Csomor
21de919394 next try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:20:21 +00:00
Stefan Csomor
ceeba66331 xml error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:19:35 +00:00
Stefan Csomor
8452d8b56b switching attributes, spaces got eliminated to aggressively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 18:17:34 +00:00
Stefan Csomor
5545427f42 adding builds for stable branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 16:44:56 +00:00
Stefan Csomor
8e72de187e attempt at using variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 16:13:07 +00:00
Stefan Csomor
22ee0cf589 clang and ccache warnings suppression also for .mm files, turn off other builds temporarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 15:15:24 +00:00
Stefan Csomor
3b9a328662 clang warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 14:37:11 +00:00
Stefan Csomor
fa6beb56ab trying to tune ccache and clang cooperation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 14:13:12 +00:00
Stefan Csomor
fa33a6b912 raising trunk SDK, removing Carbon build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 13:29:31 +00:00
Stefan Csomor
fe4253bab3 revert in case the buildbot problem was caused by this change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 10:16:45 +00:00
Stefan Csomor
2e65e9199b remove carbon build temporarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-05 10:14:32 +00:00
Vadim Zeitlin
202f62b4c4 Generate 64 bit configurations in MSVC 8/9 projects.
Update bakefile configuration to include x64 configurations into MSVS 2005 and
2008 projects (2003 doesn't support building in 64 bits, 2010 and later are
manually maintained and already have them) and rebake the projects.

Closes #13675.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-24 23:54:08 +00:00
Vadim Zeitlin
c9220befc7 Remove the old release making instructions and scripts.
Using git-based scripts seems to work well and the old scripts are not
maintained any more and having several ways of making releases is just
confusing, so leave only one set of scripts, the one actually used since
2.9.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-15 01:33:33 +00:00
Vadim Zeitlin
2594929d9f Move include/wx/unix/execute.h to include/wx/unix/private.
This header is private and is not supposed to be used from the outside the
library.

See #16325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-11 14:55:08 +00:00
Vadim Zeitlin
6a66c5fbde Move wx/html/forcelnk.h back to wxHTML from wxBase headers.
This partially undoes r32570 which doesn't seem necessary any more as
wx/html/forcelnk.h is only used in wxHTML since the addition of wx/link.h soon
after that revision and having it in wxBase is completely unnecessary and just
looks strange.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:21 +00:00
Vadim Zeitlin
53a0ef75c1 Update MSVC 10+ projects with upmake.
Update the files used in MSVC 10, 11 and 12 projects from the master files
list.

The main change is the removal of all headers from the core project: it
doesn't seem to make sense to have all headers, even for the completely
unrelated projects, in it and it is easier to just have the core own headers.

The only other changes are the addition of a few headers (including the .cpp
files used as headers) to the base project and the removal of the files which
are never built (but still appear in auto-generated by bakefile projects
because they could have been used in wxUniv case) in the core project.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:14 +00:00
Vadim Zeitlin
271d1e4589 Add first draft version of upmake, tool for updating makefiles.
Start moving away from files.bkl as the primary source for the files -- and
away from bakefile itself as the make/project file generator -- by storing the
list of files in a new build/files file and provide a simple build/upmake
script for updating files.bkl and the manually maintained MSVC10+ projects
from this file contents.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:09 +00:00
Vadim Zeitlin
38f55079e5 Add missing wx/msw/webview_missing.h header to MSVC 10+ webview projects.
This file was present in auto-generated VC[789] projects but was forgotten in
the manually maintained ones, add it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:03 +00:00
Vadim Zeitlin
6d54670f1e Separate MSW resource files from the headers.
Use separate MSW_HDR and MSW_RSC variables instead of putting everything into
MSW_HDR: resources, such as .manifest, .bmp, .ico and .cur files, don't belong
to the headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:59 +00:00
Vadim Zeitlin
477fd425e4 No real changes, just use FOO_CMN_{SRC,HDR} for all libraries in files.bkl.
Make variable definitions consistent for all libraries: previously some of
them were decomposed in FOO_CMN_SRC and FOO_PLATFORM_SRC parts while others
just defined FOO_SRC directly and interpolated FOO_PLATFORM_SRC into it.

Use helper FOO_CMN_SRC for all of them now, as it will make it easier to
update them automatically (and the same thing for headers, i.e. HDR variables).

No changes to the generated project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:56 +00:00
Vadim Zeitlin
da422ea6a3 Minor cleanup in files.bkl.
Remove duplicate file.

Remove commented out variable assignments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:52 +00:00
Vadim Zeitlin
15f255cebb Remove support for Digital Mars compiler.
This compilers is not being developed any longer since many years, drop
support for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:23 +00:00
Vadim Zeitlin
49b8d79c87 Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly
can't be used to build the current wxWidgets sources anyhow, so remove all
support for it, including a lot of extremely ugly workarounds for its bugs
with template functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:06 +00:00
Vadim Zeitlin
3a9237d78b Update wx/android/setup.h automatically from wx/setup_inc.h too.
Not sure if this file is actually used at all right now, but update it to
avoid discrepancies with the other setup[0].h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:00:29 +00:00