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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
