cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,502 Commits 1 Branch 0 Tags 333 MiB
5cce48186c
Commit Graph

53 Commits

Author SHA1 Message Date
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
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
01f9accd19 Remove wxPM, wxWidgets port to OS/2. 
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-05-15 23:56:58 +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
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
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
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
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
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
b02dd12239 Use /bin/echo for creation of Mac OS X PkgInfo files. 
The built-in of /bin/sh doesn't handle "-n" option that we use (at least not
under OS X 10.6), so we were getting "-n APPL????" in the generated files.
Fix this by using /bin/echo which does support this option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-28 22:48:39 +00:00
Vadim Zeitlin
51ec29ea5d Always link with expat in monolithic build. 
Fix linking errors when using wxXML in sttaic monolithic build: in this case
we must link with expat but it was listed too early, before wxWidgets
libraries using it, in the bakefile-generated makefiles.

Now add it to the end of the linker command line too by including -lexpat in
EXTRALIBS_FOR_BASE which are appended to the linker arguments.

Notice that now -lexpat is linked twice because it is still added by
<wx-lib>xml</wx-lib> in bakefiles, even in monolithic build, but I don't know
how to avoid it and it is harmless anyhow.

Closes #12573.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-25 13:28:01 +00:00
Vadim Zeitlin
08670ea85a Update version to 2.9.4 in version.bkl too and rebake everything. 
Change the version for Unix shared libraries too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-18 14:35:50 +00:00
Steve Lamerton
92b4653a62 Rebake trunk after wxWebView merge and add missing project files for the wxWebView library. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-09-11 10:12:19 +00:00
Vadim Zeitlin
00eef16d51 Rebake everything using bakefile 0.2.9. 
Update configure and bakefile.m4 for the new version too.

Also add the missing makefiles and projects for the XTI sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-03 15:02:45 +00:00
Kevin Ollivier
00fb97de2c Rebake. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-09 19:56:18 +00:00
Kevin Ollivier
f82b7036e8 Rebake after last commit. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-11-18 19:22:58 +00:00
Vadim Zeitlin
7880889720 Rebake everything using bakefile 0.2.7. 
Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-22 16:53:10 +00:00
Vadim Zeitlin
d12d9edacb Rebake all the samples, demos and tests makefiles. 
This should have been committed together with the changes to the debug flags
handling in build/bakefiles in r61887.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-12 13:38:08 +00:00
Vadim Zeitlin
ab5c51e5b2 don't update stc.h when not building the library, it doesn't make sense to do this in the samples makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-05-12 09:13:36 +00:00
Kevin Ollivier
23513e07f5 Rebake after latest changes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-04-26 02:04:16 +00:00
Chris Elliott
95ff11c4bb update bakefile to 0.2.6 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-04-24 10:36:24 +00:00
Kevin Ollivier
2fd716136a Rebake after last change. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-15 16:14:56 +00:00
Kevin Ollivier
0f425df617 Rebake after Mac bundle change. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-13 05:27:13 +00:00
Kevin Ollivier
7da00c46e1 Land the rest of the changes made by a rebake after r59067. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-02 20:11:39 +00:00
Vadim Zeitlin
506e9b7ed2 rebaked using bakefile 0.2.5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-27 16:40:51 +00:00
Vadim Zeitlin
8ece421c6c rebaked makefiles with 0.2.4 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-08 15:44:49 +00:00
Kevin Ollivier
7664a67f57 Rebake after bakefile changes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-20 23:59:10 +00:00
Stefan Csomor
1aac44b9da adding new toolkits for osx 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-11 12:30:18 +00:00
Kevin Ollivier
509f339a81 rebake 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-04 07:57:32 +00:00
Stefan Csomor
2383c21c63 mac paths updated 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-12 18:15:36 +00:00
Václav Slavík
e835292782 regenerated all trunk makefiles with bakefile-0.2.3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-02 14:48:50 +00:00
Václav Slavík
6e0fbb3dbf regenerated makefiles with bkl-0.2.3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-23 12:13:07 +00:00
Vadim Zeitlin
7379e47609 rebaked everything, fixes problems with OpenGL samples makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-15 00:25:59 +00:00
Chris Elliott
444833b323 update makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-11 15:58:04 +00:00
Robin Dunn
ae4ccf12b6 rebaked after changing the version number 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-07 02:14:45 +00:00
Robin Dunn
25bb1412af Move version number to 2.8.0.0 and rebake the makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-10 02:32:01 +00:00
Vadim Zeitlin
69199aad02 rebaked with baefile rev 928 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-04 20:39:49 +00:00
Robin Dunn
2add9e3c2f Moved version number to 2.7.2.0 and rebaked 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-28 21:54:52 +00:00
Robin Dunn
3abcf424a3 Bumping the version number also requires that version.h be modified, 
and also rebaking the makeifles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-09 01:20:56 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-29 07:16:39 +00:00
Vadim Zeitlin
77a7dfc1a1 regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-10 19:51:08 +00:00
David Elliott
8ced02f601 Ran make -f build/autogen.mk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-25 05:17:36 +00:00
David Elliott
0ee4059da2 Ran bakefile -f autoconf and autoconf. 
Some missing headers have been added, the *NODOT variables were
added to samples makefiles and the version changed from 2.6.2 to 2.7.0.
Generated configure now includes "OS/2" fixes per wxAutohacks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-01 03:42:14 +00:00
Michael Wetherell
2113bc7764 Rebake after MSLU and other changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-03 16:10:12 +00:00
Julian Smart
0d90d6ea7a Rebake for 2.6.2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-28 12:48:14 +00:00
Julian Smart
47a4a1aec8 Baked files for 2.6.1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-31 16:38:10 +00:00
Robin Dunn
d391f6679d Removed rules for copying the Mac resource file since they are no 
longer needed for wxMac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-14 22:11:55 +00:00
Julian Smart
4818141bb2 Changed version number 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-11 15:50:13 +00:00
Julian Smart
8c9f8f91cd Updated version to 2.5.5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-23 13:05:13 +00:00
David Elliott
94acd38ec2 Rebaked with Bakefile 0.1.7. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-19 03:56:12 +00:00