Commit Graph

2231 Commits

Author SHA1 Message Date
Vadim Zeitlin
d24f711f88 Only link webview library with libwebkitgtk in wxGTK, not the core one.
Add EXTRALIBS_WEBVIEW similar to the existing EXTRALIBS_MEDIA and such and set
it in configure instead of adding libwebkitgtk and dependent libraries
directly to GUI_TK_LIBRARY.

This ensure that the core library doesn't have any dependencies on
libwebkitgtk which it doesn't need.

Closes #16624.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-16 13:33:08 +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
e762c4ce83 Check that there are no uncommitted changes in the release script.
Any such changes wouldn't be included in the release, which is probably
unexpected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 21:50:20 +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
Vadim Zeitlin
36367a650a Remove wrong freshness check from build/update-setup-h script.
This didn't work correctly if a header was updated from its corresponding
setup0.h first as it was then newer than include/wx/msw/setup_inc.h even
though it had been older than it at the start of the script execution.

Just keep things simple and get rid of the check.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-15 17:27:46 +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
db13dbc1f6 Move wxAppProgressIndicator into its own header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:58:12 +00:00
Bryan Petty
cf5b3021c6 Don't link shlwapi directly.
For MSVC use #pragma comment to link shlwapi, and for MinGW use dynamic
loading of this library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:57:06 +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
Bryan Petty
076747aa81 Introduce skeleton of taskbar button feature.
- Add classes: wxTaskBarButton and wxTaskBarButtonImpl.
- New interface in wxTopLevelWindowMSW to get its wxTaskBarButton:
    MSWGetTaskBarButton.
- A simple sample and build files under msvc.

Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 14:49:33 +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
Chaobin, Zhang
1fa04989f3 Introduce skeleton of taskbar button feature.
- Add classes: wxTaskBarButton and wxTaskBarButtonImpl.
- New interface in wxTopLevelWindowMSW to get its wxTaskBarButton:
    MSWGetTaskBarButton.
- A simple sample and build files under msvc.

Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 08:37:43 +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
a87501b4f2 added d2d
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-08 14:10:54 +00:00
Stefan Csomor
5109fbc24b added d2d
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-08 14:10:38 +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
51d715e46d Add wxPowerResourceBlocker for power management.
Add functions to acquire/release power resources, preventing/allowing back the
system to go to sleep or turn off the screen and a class wrapping them in a
safe way.

This patch implements the functions for MSW and OSX, adds documentation and
updates the sample to demonstrate the new functionality.

Closes #16413.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-29 23:22:15 +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
Stefan Csomor
22f1f3e8ec updated multi-lib project file with naming close to Makefile convention
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 16:27:21 +00:00
Stefan Csomor
fe28a8aa66 updated AppleScript for multilib builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 16:25:55 +00:00
Stefan Csomor
f6ce35d047 naming closer to Makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 15:52:00 +00:00
Stefan Csomor
0b76c263d2 naming closer to Makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 15:51:14 +00:00
Stefan Csomor
da934c9df4 new separate config file for base
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 15:50:11 +00:00
Stefan Csomor
7181e98545 multi-lib cocoa project
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 15:06:03 +00:00
Stefan Csomor
5bd081a1c7 multi-lib template
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 15:05:42 +00:00
Stefan Csomor
2c8ef91312 preproc changed for multi-lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 15:03:54 +00:00
Stefan Csomor
10740f2f67 multi-lib configs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-11 09:30:50 +00:00
Stefan Csomor
166bda1505 preparing for multi-lib builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-10 17:15:09 +00:00
Stefan Csomor
7c13d6bfe3 no filepath subgroups in xcode projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-10 15:43:59 +00:00
Stefan Csomor
f1d2aa8067 get rid of execute.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-10 14:45:46 +00:00
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