Commit Graph

2059 Commits

Author SHA1 Message Date
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
Vadim Zeitlin
497b4e64ce Fix checking for GTK+ 3.0 in configure.
Update gtk-3.0.m4 to work correctly with gthread module and regenerate
configure using the new version of this file.

Closes #15319.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-10 20:48:48 +00:00
Václav Slavík
661698e54f Define WXBUILDING in Xcode projects.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-10 16:35:07 +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
0053219faf Remove the TOOLKIT test from msvc-headers-setuo-h definition.
This is unnecessary now that TOOLKIT is back to being a constant again and
results in errors if GTK TOOLKIT is enabled.

Closes #14965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 12:58:45 +00:00
Vadim Zeitlin
11a3e7b6da Update the version of Expat used to 2.1.0.
Merge with the latest version, mostly discarding our changes to 1.95.6 as they
seem to be unnecessary any longer, keep just bakefile-specific addition to
configure.

Also update our own makefile to define HAVE_EXPAT_CONFIG_H which is now needed
by Unix build.

Closes #11677.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 12:45:30 +00:00
Vadim Zeitlin
c80ae45452 Only link with libwxscintilla if using Scintilla is enabled.
Correct the changes of r74408 to avoid using libwxscintilla if we don't build
it at all.

See #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 19:14:59 +00:00
Paul Cornett
79bca169e5 move treeentry_gtk.h to include/wx/gtk/private/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 15:44:21 +00:00
Vadim Zeitlin
a4830bb560 Always add libwxscintilla in monolithic mode.
The library was already present in the makefiles but came before the
monolithic library itself, which broke the linking of the samples when using
GNU ld as the dependent libraries must come after the libraries using them.

Closes #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 12:41:02 +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
2ccfebab09 Extract PipeIOHandler class into a header and rename to wxWakeUpPipe.
No real changes to the class, just make it possible to reuse it outside of
Unix wxEventLoop code.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-03 00:27:28 +00:00
Stefan Csomor
6b34995cc6 partial revert, as we still need Xcode 3.1 for 10.5, Xcode 3.2 is 10.6+ only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 07:22:00 +00:00
Stefan Csomor
629a9eb730 update Xcode format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 07:13:44 +00:00
Stefan Csomor
52c46c7ea0 common schemes, Xcode 4/5 updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 07:09:27 +00:00
Stefan Csomor
771a3ee1d9 updated project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 06:54:55 +00:00
Stefan Csomor
ac732982f8 update project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-19 16:35:18 +00:00
Stefan Csomor
158ba0c276 updated Xcode project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-02 15:02:06 +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
Robin Dunn
933f92684f revert part of last change, run configure from the builddir or cwd, not from configure's location.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-26 16:48:23 +00:00
Robin Dunn
dd203d5b86 Changes needed to help builder.py be more generic and working well with other modules
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-26 06:37:17 +00:00
Robin Dunn
9ad2035a4f also check for the SDK in subtrees used by newer XCodes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-10 23:06:21 +00:00
Vadim Zeitlin
5b45240914 Remove rightarr.cur which doesn't exist any more from files list.
This should have been part of r73491, see #14991.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-08 10:03:55 +00:00
Václav Slavík
45c363c5eb Use the same wxDEBUG_LEVEL settings for Xcode projects as elsewhere.
Use the same debug flag default settings in the build/osx Xcode projects
as are used by all other makefiles and projects - that is,
wxDEBUG_LEVEL=1.  This is done automatically by the headers, no need to
define any extra symbols when building.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-03 18:13:30 +00:00
Robin Dunn
7c3f702506 don't use string module
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-05 06:50:28 +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
Robin Dunn
823e18c7bc Fix MSVCBuilder so it can pass an alternate make command to the Builder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-22 05:59:59 +00:00
Robin Dunn
317bc825f4 Enable using jom in place of nmake in the wxMSW build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-22 05:59:51 +00:00
Robin Dunn
2e59a53a59 Add version check for MSVC 10
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-22 05:59:42 +00:00
Stefan Csomor
0a0ef66da4 using default compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-13 19:28:52 +00:00
Stefan Csomor
bcc9d6175f added new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-12 11:49:52 +00:00
Stefan Csomor
1328971210 added new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-12 11:18:04 +00:00
Stefan Csomor
987355680a added new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-12 10:51:12 +00:00
Stefan Csomor
ded960e328 adding lexlib header include, turning off utf8 default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-12 10:49:16 +00:00
Stefan Csomor
a7ff4094ae missed the ppc switch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-12 10:34:13 +00:00
Stefan Csomor
38c1c5999a increasing deployment to 10.5 min
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-12 10:33:13 +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
Stefan Csomor
a4130412a3 updated for 10.5 minimum
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-21 08:26:55 +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
Robin Dunn
12c6bfab40 Patch from niki@vintech.bg allowing builds for Python 2.5 (using MSVC 7.1) to work again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-14 02:10:15 +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