Commit Graph

617 Commits

Author SHA1 Message Date
Vadim Zeitlin
d2ddb2c7c0 Add XRC handler for wxActivityIndicator control.
The only attribute for this control is a boolean "running" which can be set to
start the indicator on load.

Update the schema, documentation and the XRC sample.
2015-03-20 00:08:38 +01:00
Vadim Zeitlin
3f84cb17ca Add wxActivityIndicator control.
This is a simple animated control indicating some program activity.

Provide native GTK+ (for > 2.20) and OS X implementations as well as a generic
one used under MSW.

Update the sample and the documentation.
2015-03-20 00:08:37 +01:00
Vadim Zeitlin
f1cc587a99 Mark MSVS *.props files as using CR LF as well.
For consistency with *.vcxproj and *.sln.
2015-03-19 21:46:05 +01:00
Vadim Zeitlin
3c59f46b64 Convert even more CRLF files to use LF in the git repository.
Somehow more files appear as modified now, after fixing "all" of them in the
previous commit. Convert these files as well. Will there be more in the next
clone?
2015-03-19 21:15:11 +01:00
Vadim Zeitlin
c3e5751c36 Convert all CRLF files to use LF to fix git confusion.
Having CRLF files in the repository with eol=crlf breaks just about
everything, e.g. any rebase/merge involving these files would fail.
Try to fix this by making sure the files use LF in the repository and CRLF is
only used in the working copy.
2015-03-19 15:10:48 +01:00
Vadim Zeitlin
453897149f Add wxAddRemoveCtrl class.
This is a simple high level helper combining an arbitrary control showing
multiple items with the buttons allowing to add items to and remove items from
this control, but using the buttons and the layout appropriate for the current
platform.

Add the implementation itself, an example of using it to the dialogs sample
and the documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-09 00:26:11 +00:00
Vadim Zeitlin
a2915312c2 Add include/wx/richtext/richtexttabspage.h to the MSBuild project.
This seems like an occidental omission.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-01-03 01:07:47 +00:00
Vadim Zeitlin
503d4e7f06 Remove files not being compiled from richtext MSBuild project.
Several sources in this project are actually not compiled at all, but are
included from other files, so they don't appear in the master sources list.

Update the project accordingly, for consistency with the earlier versions of
MSVC.

If these files should appear in it, they need to be added to RICHTEXT_HDR
variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-01-03 01:07:43 +00:00
Vadim Zeitlin
e498f96af8 Add appprogress.{h,cpp} to the files list.
The wxMSW header was absent from both the bakefile and master file list, and
the latter also lacked the other wxAppProgressIndicator-related files.

Also regenerate the project file to contain the MSW header.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-01-03 01:07:39 +00:00
Vadim Zeitlin
2f51147732 Fix resource compiler include path for Borland.
Explicitly include $(BCCDIR)/include/windows/sdk directory in the resource
compiler options, as it needs it to find windows.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-11 16:30:00 +00:00
Vadim Zeitlin
43c99ef613 Refactor: create src/univ/anybutton.cpp.
Extract and pull the common functions from wxButton and wxToggleButton to
wxAnyButton in wxUniv too.

Also make wxToggleButton inherit from wxToggleButtonBase correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:38:47 +00:00
Bryan Petty
872fd95693 Rebaked with new wxTaskBarButton and taskbarbutton sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:59:13 +00:00
Bryan Petty
124129a45f Rename appprog.{h,cpp} to appprogress.{h.cpp}.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:58:55 +00:00
Bryan Petty
b4ee657f41 Update VS2010+ project files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:58:22 +00:00
Bryan Petty
952a6eabf4 Update bakefiles and VS2010+ project file.
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:55:48 +00:00
Bryan Petty
c13a06abb0 Move wxTaskBarButton into core library.
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:51:51 +00:00
Chaobin, Zhang
23ce61c395 Reverting failed mering of SOC2014_TASKBAR.
Command: git svn dcommit is aborted, and the two branches is diverged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 11:57:58 +00:00
Chaobin, Zhang
c17570e8e2 Move wxTaskBarButton into core library.
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 09:15:07 +00:00
Bryan Petty
3ade92601d Rebaked D2D additions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 05:54:33 +00:00
Stefan Csomor
529a487877 rebaked, d2d addition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-09 07:42:35 +00:00
Stefan Csomor
1edef6dc68 added d2d
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-08 14:09:56 +00:00
Vadim Zeitlin
f01e6a7efd Rebake MSW makefiles properly after wxQt merge.
Somehow the makefiles contained references to a non-existing
src/common/textdlg.cpp, fix this by rebaking them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-25 17:47:44 +00:00
Vadim Zeitlin
df13791078 Merge wxQT branch into the trunk.
This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-24 01:50:11 +00:00
Vadim Zeitlin
21da20d579 Restore dynamic linking of GDI functions for non-MSVC.
This partially reverts the changes of r77029 and r77039: now functions such as
Set/GetLayout(), AlphaBlend() and GradientFill() are still called (almost)
directly when using MSVC but pass by dynamic loading with the other compilers,
which don't have #pragma comment(lib) and, in MinGW case, also lack some of
these functions in their libraries even if we do link with them.

Closes #16411.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-14 12:11:39 +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
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
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
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
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
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
a7a2978fb1 Remove remaining MSVC6 workspace files.
See #15726.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 10:00:30 +00:00
Vadim Zeitlin
0d4ad161d5 Remove support for Win9x from wxMSW.
Most importantly, this allows us to remove all MSLU-related stuff.

Some functions which were previously loaded dynamically can now be just used
directly, too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 02:33:40 +00:00
Vadim Zeitlin
f4b80e5337 Remove MSVC6 support.
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 22:32:17 +00:00
Vadim Zeitlin
f8fb172d64 Remove non-existent wx/ownerdrawnbutton.h from MSVS projects.
This resulted in constant spurious rebuilds as this file doesn't exist, only
wx/msw/ownerdrawnbutton.h does.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:32 +00:00
Vadim Zeitlin
dc83267cbe Put files in the correct groups in MSVS manually maintained projects.
Don't show textmeasurecmn.cpp, textmeasure.cpp and xmlreshandler.cpp at the
top project level.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:29 +00:00
Vadim Zeitlin
3fd098960f Add LexRust.cxx to manually generated MSVS project files.
This should have been part of r76121, see #15742.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:12 +00:00
Vadim Zeitlin
84a934b456 Remove DebugInformationFormat options from MSVC 10+ projects.
This option is common to all projects and is defined in the global properties
file, so it doesn't need to be present in the projects themselves at all.

See #16236.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:10:06 +00:00
Vadim Zeitlin
4386f20f4f Generate debug information for all MSVC builds.
We want to have debug information even for the release builds as it doesn't
affect the binaries produced but greatly helps when debugging, so create PDB
for all release builds as well in the manually maintained MSVS files (this was
already the case for Win32 release builds but not x64 ones for some reason).

This also fixes the problem with "None" being an invalid value for
DebugInformationFormat with MSVC 10 as a side effect.

Closes #16236.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-07 13:09:55 +00:00
Vadim Zeitlin
0a3329546b Add wx/msw/ownerdrawnbutton.h to {make,project} files.
In particular, ensure that it's installed when using configure+make.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-06 11:44:14 +00:00
Vadim Zeitlin
e3979f5186 Bring MSVS 2010 projects in line with 2011 and 2012 ones.
The new projects are easier to customize as the build options can now be
specified in wx_vc10_local.props file. They also have correct dependencies and
avoid sharing violations when copying wx/setup.h.

Finally, they also use the correct names for the webview DLL, see #15820.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-04 22:12:27 +00:00
Vadim Zeitlin
6b12d12fe9 Fix property sheets names in MSVS 2013 custom build project.
It must be vc12, not vc11.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-02 14:19:59 +00:00
Vadim Zeitlin
0a62ce8c8e Add dependency of wxregex on wx/setup.h in MSVS projects.
Modified regex library code uses wx headers, so build _custom_build project
creating wx/setup.h before it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-02 14:19:56 +00:00
Vadim Zeitlin
bf793227d2 Extract setup.h copying into a separate project for MSVC11+.
This fixes problems with parallel builds in Visual Studio 2012 or 2013 IDE as
multiple projects may try to copy setup.h file at once, resulting in errors.

Use _custom_build project as a common dependency to ensure that the copy step
is done only once.

Closes #16177.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-27 22:41:59 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Vadim Zeitlin
d53c1e7b09 Define XML_STATIC in Expat header instead of Expat projects.
This reverts r74444 and defines XML_STATIC unconditionally in Expat sources
themselves as we always use the built-in Expat as a static library, so this
solution is simpler and more portable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 14:44:56 +00:00
Vadim Zeitlin
23cebdf4f5 Define XML_STATIC for Expat build to fix linking of Windows DLLs.
The new Expat assumes it's built as a DLL by default, define XML_STATIC to
indicate that this is not the case as we always build it as a static library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 13:58:33 +00:00
Vadim Zeitlin
f901941933 Make TOOLKIT variable constant in MSW makefiles.
This fixes duplicate lines defining rules for generic files for more than one
port in the makefiles.

Closes #14979.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 11:59:35 +00:00
Vadim Zeitlin
691745ab41 Add a public wxModalDialogHook class for intercepting modal dialogs.
Extract wxModalDialogHook from wx/testing.h into its own wx/modalhook.h,
extend it to allow to be notified not only about showing modal dialogs but
also about dismissing them and document it and show its use in the dialogs
sample.

Also replace all the WX_TESTING_SHOW_MODAL_HOOK macros occurrences with
WX_HOOK_MODAL_DIALOG.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-20 13:15:41 +00:00
Václav Slavík
2aab96f58d Add wxPreferencesEditor class.
Implements native UI for preferences editing.  In particular, the API
handles the differences between modal (Windows) and non-modal (OS X) preferences windows and provides platform's native look.

Currently implemented natively for wxOSX/Cocoa, wxGTK and Windows (the latter is used as a fallback generic implementation as well).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-28 16:29:05 +00:00
Václav Slavík
4863951a5f Line endings fixes in bakefile-generated files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-28 14:29:00 +00:00
Vadim Zeitlin
22a3b6e4b2 Don't include wxUniversal configurations in MSVC project files.
wxUniversal is practically not used under MSW and just confuses people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-21 16:37:01 +00:00
Vadim Zeitlin
d48f13a168 Allow building wxGTK under Windows with MSVC.
Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:03 +00:00
Vadim Zeitlin
8f9acf6cc9 Bakefile updates for libtiff 4.0.3 merge.
This should have been part of r73157,

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-10 14:27:44 +00:00
Paul Cornett
9f692b010e Remove nearly empty wx/cairo.h header
It does so little now it's not worth having. And it should not have been a public header.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-02 02:28:48 +00:00
Vadim Zeitlin
3f6a19ffab Guard gmake-specific syntax with IF_GNU_MAKE in make_dist.mk.
Debian distribution target uses GNU make extensions to make syntax which makes
the entire makefile impossible to use with other make versions, e.g. Solaris
make.

Fix this by prepending IF_GNU_MAKE to all Debian-specific lines, there should
be never any need to use them with non-GNU make.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-23 14:03:53 +00:00
Vadim Zeitlin
74a59798c0 Add support for wxRibbonBar and related controls to XRC.
Add wxRibbonXmlHandler and an example of using it to the xrc sample.

Closes #12058.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-23 13:52:27 +00:00
Vadim Zeitlin
00b4e7c946 Add support for wxAuiNotebook to XRC.
Add wxAuiNotebookXmlHandler to "aui" library, now that we can do it without
adding a dependency of it on "xrc" one.

Closes #10889.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-23 13:51:58 +00:00
Vadim Zeitlin
a3b9c43bbc Refactor wxXRC to allow defining handlers outside of xrc library.
Split wxXmlResourceHandler into an ABC and the real implementation to allow
referencing the ABC in the core library itself but without pulling in all of
the XRC into it. This also allows defining XRC handlers, which only depend on
this ABC and not the xrc library, in other libraries, such as richtext, as
demonstrated by the now enabled wxRichTextXMLHandler.

Closes #10996.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-23 13:51:32 +00:00
Vadim Zeitlin
32753ae949 Add wx/meta/removeref.h header defining wxRemoveRef<> helper.
This is a very simple template allowing to remove the reference from the given
type, similar to std::remove_reference<>.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-23 12:02:00 +00:00
Vadim Zeitlin
8cd79b7af0 Factor out text measurement from wxDC and wxWindow into wxTextMeasure.
Add a new private wxTextMeasure class implementing methods for measuring text
and move the often duplicated (but not always identically) code for doing the
same from wxDC and wxWindow into it.

Currently this class is only really implemented in wxMSW and wxGTK.

Also extend the test for text measuring functions and rename it to
MeasuringTextTestCase from MeasuringContextTestCase as it's not wxGC-specific
any more.

Closes #14705.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-17 22:35:49 +00:00
Vadim Zeitlin
226fa6db3d Improve SAFEARRAY support in wxMSW OLE Automation code.
Add a new wxSafeArray<> class wrapping SAFEARRAY.

Also add support for converting VARIANTs containing other, previously
unsupported, standard types.

Closes #14637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-23 22:49:50 +00:00
Vadim Zeitlin
410e9d277c Rebake after addition of richtexttabspage.h in r72497.
See #14644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-17 12:18:52 +00:00