cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,589 Commits 1 Branch 0 Tags 333 MiB
6bf921176c
Commit Graph

214 Commits

Author SHA1 Message Date
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
908d92cd83 Fix taskbar sample compilation under wxOSX/Cocoa. 
Use wxTBI_XXX constants instead of wxTaskBarIcon::XXX ones which don't seem to
exist any longer.

See #11831.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-10-28 01:08:20 +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
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks. 
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-04 00:28:58 +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
49a63afbad Avoid CRT deprecation warnings for MSVC build using makefiles too. 
Define _CRT_SECURE_NO_DEPRECATE, _CRT_NON_CONFORMING_SWPRINTFS and
_SCL_SECURE_NO_WARNINGS when using makefiles to build the library too for
consistency with the project files.

These defines are only needed for VC8 and later but should do no harm for the
previous versions.

See #11009.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-07 21:38:31 +00:00
Vadim Zeitlin
ba7512e14d Rebake all project files to reflect MSVC deprecation warnings defines. 
Rebake all the projects after the changes of r70182, even if they're only
really needed for the library itself, the other project files should
correspond to the bakefiles contents too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-07 21:38:09 +00:00
Vadim Zeitlin
f2012fa639 Remove __WXMGL__ tests from the samples too. 
__WXMGL__ is not used any longer, remove it from the samples too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-01-15 18:50:35 +00:00
Vadim Zeitlin
0e1f8ea4a3 Remove wxMGL port. 
The company behind MGL toolkit (SciTech) doesn't exist since several years and
this port is not used by anybody, so remove it to ease maintenance burden.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-01-15 14:46:41 +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
Stefan Csomor
733fa5907d make sure the quit item is only shown where appropriate on osx 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-28 10:07:00 +00:00
Stefan Csomor
a96f3e138b osx_cocoa supports both kind of taskbaricons in the menubar (standard) and as function of the dock (type DOCK) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-28 09:26:55 +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
Václav Slavík
b796194b15 Regenerated makefiles after removing USE_GDIPLUS. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-09 14:14:26 +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
da8b1d4b3b Rebake from clean wx tree. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-04 00:45:45 +00:00
Vadim Zeitlin
94b6ce7f4b Use X64 machine type for MSVC linker instead of old AMD64. 
The officially supported machine type name is X64 now, even if AMD64 is still
supported.

Closes #10711.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-08 16:36:37 +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
Kevin Ollivier
a7ebaf0ddd Bakefile 0.2.8 rebake. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-31 20:56:47 +00:00
Vadim Zeitlin
8c9833d09e Rebaked using post-0.2.7 svn version of bakefile. 
Unfortunately 0.2.7 release contained a bug in msvc backend which resulted in
warnings generated for each file compiled. Apply the fix from bakefile svn to
fix this (and test if no other problems are found).

Also update all makefile.unx after changes of r62477.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-23 17:48:21 +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
Kevin Ollivier
d5e7ffcf7a Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-08 04:07:02 +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
9a83f86094 Globally replace _T() with wxT(). 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 20:30:22 +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
3fe02baaea Removing more CodeWarrior samples. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-12 19:37:41 +00:00
Francesco Montorsi
076218c2a9 add headers to the samples' bakefiles so that they show up in MSVC project files 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-04 11:47:32 +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
31848e7da5 remove MSVC solution files from svn 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-17 13:22:59 +00:00
Vadim Zeitlin
b44f5137ce link with wininet.lib under Windows to avoid linking errors in wxUSE_URL_NATIVE==1 build (#10338) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-15 13:33:51 +00:00
Francesco Montorsi
954360caca fix crash because of a missing wxOK constant 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-05 16:15:09 +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
7da8bfe30d add VC9 project files (closes #9960) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-08 16:42:00 +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
Václav Slavík
cf78bdcb68 added wxTaskBarIcon::IsAvailable 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-30 20:54:02 +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
Vadim Zeitlin
b2c9e3447d remove unneeded dependencies from bakefiles and regenerate the make/project files (closes #9850) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-21 22:18:31 +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
c3c11581dc added VC7/8 project files for samples 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-27 11:38:07 +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
747d7d7c15 made all XPM const to avoid warnings from mingw32 4.0 and adopt the code accordingly (patch 1872384) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-16 01:39:44 +00:00