Commit Graph

2110 Commits

Author SHA1 Message Date
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
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
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
81765ad4b8 Added buildbot slave configuration for brandt64.
New 64 bit build slave ran by Gerald Brandt with just a couple of builds for
now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-17 00:24:11 +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
Julian Smart
af71fb72a0 Added include/wx/richtext/richtexttabspage.h to files.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-16 15:31:05 +00:00
Steve Lamerton
0bfd90b3e7 Add generic wxFileSystem support to wxWebView using wxWebViewFSHandler.
Closes #14623.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-11 09:26:58 +00:00
Steve Lamerton
e52aec972c Move wxWebViewIE missing definitions to webview_missing.h and add new definitions required for Find.
These are required as some compilers, notably MinGW and VC6, do not include up to date headers. Fixes #14621.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-10 20:02:58 +00:00
Vadim Zeitlin
6457b0bcc1 Output the values of all USE_XXX options to build.cfg file in MSW builds.
USE_RTTI, USE_AUI, USE_PROPGRID, USE_RIBBON, USE_RICHTEXT, USE_STC and USE_XRC
options were not output to the build configuration file, unlike the rest of
them.

Do output those ones as well now for consistency.

Also sort the options corresponding to different wx libraries alphabetically.

Closes #14608.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-09 00:42:55 +00:00
Vadim Zeitlin
03c1266970 Link MSW-specific event loop files in wxUniv/MSW.
This fixes wxUniv build after the changes of r72008.

Closes #14606.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-09 00:42:03 +00:00
Dimitri Schoolwerth
8566fe6edf Regenerated Xcode projects.
Updated the Xcode projects for Scintilla 3.21 and removal of src/osx/spinctrl_osx.cpp.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-07 20:15:29 +00:00
Dimitri Schoolwerth
1ee968ea97 Updated instructions for XML Tools.
A newer version of XML Tools has been released (2.9.4) which supports OS X 10.6 and later. As such a link to the beta version of 2.9.4 is not needed anymore.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-07 20:11:00 +00:00
Vadim Zeitlin
36090ae57e Remove wxOSX implementation of wxSpinCtrl and use the generic one.
wxOSX doesn't provide a native spinner+text control so it used a generic
implementation of wxSpinCtrl but a different one to the version found in
src/generic/spinctlg.cpp.

Just use the real generic version instead, it doesn't make sense to have two
different versions of the same generic control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-30 20:24:12 +00:00
Vadim Zeitlin
cc699de848 Added wxSimplebook class: a wxBookCtrl without controller.
This new control allows the program to show one of the several pages without
allowing the user to change them (or even see that there are several of them)
himself.

This class is fully inline, so it doesn't add anything to the library and
hence doesn't need neither wxUSE_SIMPLEBOOK nor the corresponding configure
option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-30 20:21:54 +00:00
Václav Slavík
ee915a646f Include gettext MO files in distribution archives.
It's the usual thing to do. Ideally, we'd also compile them as part of
build process, at least on Unix, but this is better than nothing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-30 09:59:14 +00:00
Robin Dunn
6342ec7aba rebake make/project files for new scintilla
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-14 05:14:27 +00:00
Robin Dunn
403c71da25 Allow --mac_universal_binary to use a "default" value.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-09 16:54:24 +00:00
Robin Dunn
803a4f2e17 Revert change that installs the wx/gtk/dc.h header file, since we no longer need wxDCImpl classes to be public.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-03 03:57:06 +00:00
Robin Dunn
0a898d4ca0 Enable the wxMediaCtrl backend for wxOSX-cocoa in the build and fix some bugs that were causing it to not send the EVT_MEDIA_LOADED events and to not have a valid best size set. Closes #13065
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-02 20:25:16 +00:00
Václav Slavík
e0ea79b805 Fix installed wx-config broken by r72205.
In an attempt to fix DESTDIR support on platforms without symbolic
links, this commit completely broke the wx-config symlink created by
"make install" everywhere (unless you were insane enough to use
"--prefix=/", that is): $(libdir) is absolute path and so using
../$(libdir) has no chance of working.

Fixed by using `basename $(libdir)`. This is still unsatisfactory,
because it assumes that $(libdir) and $(bindir) are at the same level in
the filesystem -- which, while usually true, is by no means guaranteed.
But at least this works most of the time.

See #14517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-29 08:52:52 +00:00
Vadim Zeitlin
5ed53483fe Move new wxGTK wxNotificationMessage files to adv from core.
The new files were erroneously added to the wrong place, move them where they
belong.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-27 19:36:59 +00:00
Vadim Zeitlin
afbf46a317 Implement wxNotificationMessage using libnotify in wxGTK.
Use libnotify -- if detected by configure -- to provide native notifications
in wxGTK. Our API maps to libnotify one in rather straightforward way, we
might consider extending it to cover more of libnotify functionality
(categories, user-defined icons and, especially, actions) later.

Also update the dialogs sample to show another kind of notification and the
documentation to clarify the behaviour of various methods.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-27 15:36:54 +00:00
Vadim Zeitlin
b9b55ad516 Add all extra GTK libraries to GUI_TK_LIBRARY in configure.
Some libraries (e.g. Pango) were added to GUI_TK_LIBRARY already while others
(e.g. Hildon) had their own EXTRALIBS_HILDON variables that were then added to
EXTRALIBS_GUI separately. Finally, some others were simply broken because
neither EXTRALIBS_GNOMEVFS nor EXTRALIBS_GTKPRINT were set anywhere.

Standardize on using GUI_TK_LIBRARY for everything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-27 15:36:40 +00:00
Vadim Zeitlin
7ce6da52a1 Extract OS X non-GUI event loop in a separate header.
This will allow its reuse from non-wxOSX ports, e.g. wxGTK under OS X.

Closes #14519.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-24 20:45:43 +00:00
Vadim Zeitlin
b0067d881b Use relative path for wx-config symlink in "make install".
This fixes "make DESTDIR=..." Broken by r71050 but still allows "make
DESTDIR=... install" to work even under MinGW where "ln -s" is mapped to "cp"
and so doesn't work with non-existing first argument.

Closes #14517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-24 20:45:36 +00:00
Robin Dunn
508bd1654f Install the wx/gtk/dc.h header file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-24 19:12:39 +00:00
Vadim Zeitlin
eff9d7f55a Use wxGTK platform-specific files in wxAdv under OS X.
Closes #14501.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-23 15:03:15 +00:00
Vadim Zeitlin
5146904d0f Refactor wxMSW helper functions to allow reuse in wxGTK.
Extract wxMSW-specific part of src/msw/utilsgui.cpp into a new
src/msw/utilswin.cpp file to allow reuse the rest of the former file in wxGTK.

Closes #14424.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-14 20:11:04 +00:00
Vadim Zeitlin
17de606b77 Change the format of the documentation archives for the release.
Call them wxWidgets-x.y.z-docs-nnn instead of wxWidgets-docs-nnn.x.y.z.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-11 11:42:32 +00:00
Vadim Zeitlin
e27f554012 Use the same console event loop in wxBase and wxCore in wxMSW.
Refactor the console event loop code into separate files to untangle it from
the GUI version and ensure that it doesn't depend on the GUI at all. It can
now be defined in the base library and simply reused by the core one.

This also makes the console event loop usable for other ports under Windows,
e.g. wxGTK.

Closes #14426.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 23:52:00 +00:00
Vadim Zeitlin
14b682f7c3 Increase version to 2.9.5.
Rebake all the project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 23:51:44 +00:00
Vadim Zeitlin
abac13f901 Give the newly added wxGTK trunk STL builder a unique name.
It conflicted with the (unused) builder on StellarWerx slave.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 10:54:48 +00:00
Vadim Zeitlin
e6bf1a0f9e Add a wxGTK STL buildbot build on brandt32 slave.
Also use --disable-compat28 as we don't have any builds testing this option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 10:50:36 +00:00
Vadim Zeitlin
eca734c487 Added a release notes file for binaries.
Also create wxWidgets-x.y.z_Headers.7z file when making the release, it is
used with the binaries.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-09 20:35:10 +00:00
Vadim Zeitlin
97981439aa Replace "_amd64" with "_x64" in a few more places.
Fix bakefile presets and MSVC-specific setup.h.

Also document TARGET_CPU=X64 instead of AMD64.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 15:36:58 +00:00
Vadim Zeitlin
235a997f9a Use "_x64" instead of "amd64" for x64 MSW makefile builds.
Still accept "amd64" as a valid TARGET_CPU value but also accept, and
encourage people to use, "x64".

Add a new section about the build system changes to the change log and added a
mini-TOC to it to make navigating it a bit easier and show what changes are
there at a glance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:59 +00:00
Stefan Csomor
7d6a4d9696 new file added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:06:50 +00:00
Vadim Zeitlin
37e8713ee4 Fix problem with most of wxGTK headers not being installed.
GTK2_HDR should also include all the version-independent wxGTK headers.

Closes #14455.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:38 +00:00
Vadim Zeitlin
e6bd7695da Rename all setup0.h files to setup.h in git-based release script.
We also need to rename wx/univ/setup0.h and wx/gtk/setup0.h and it probably
doesn't hurt to rename all the other ones even if though they're unused
anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:35 +00:00
Vadim Zeitlin
798e3fb358 Run unix2dos in quiet mode in git-oriented release script.
Don't flood the screen with the messages about converting the files, we know
that we convert them, this is what we run the bloody thing for.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:27 +00:00
Robin Dunn
5208671fbb Add COMPILER_VERSION to nmake command line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 02:58:58 +00:00
Vadim Zeitlin
9043a590ce Use COMPILER_VERSION and ARCH_SUFFIX in libraries names in Windows makefiles.
For the official builds (only), include the compiler version and the
architecture suffix, unless it's the default x86, into the DLL names, to allow
their concurrent installations for multiple compiler versions and architectures.

Closes #13857.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:35:23 +00:00
Vadim Zeitlin
df1547b7bc No real changes, just rename DIR_SUFFIX_CPU to ARCH_SUFFIX in bakefiles.
This will be soon used in the libraries names and not only in the directory
paths so rename the variable to make things more clear (or at least less
confusing).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:35:18 +00:00
Paul Cornett
efaad1f079 remove some unused files from GTK3 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 19:10:38 +00:00
Paul Cornett
9dc44eff02 support for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:39:06 +00:00
Vadim Zeitlin
26cdd42d2c Define wxEntry() with WinMain-compatible signature for all Windows ports.
Make wxEntry(HINSTANCE, ...) available in wxGTK under Windows too.

Refactor the headers to allow this and extract Windows-specific wxEntry()
declarations in wx/msw/init.h from wx/msw/app.h for consistency with the
normal wxEntry(int, char**) declared in wx/init.h.

Closes #14423.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:28 +00:00
Stefan Csomor
9ef3f6f2c9 setting debug level explicitly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 23:21:57 +00:00