Commit Graph

197 Commits

Author SHA1 Message Date
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
Dimitri Schoolwerth
2d143b6689 Removed ellipsis from "About..." occurrences.
MS and Apple guidelines mention ellipses should generally be used when a command needs additional information from the user before the operation can execute. This is not the case for showing an about dialog so the ellipses have been removed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 16:51:09 +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
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
Vadim Zeitlin
3cb332c155 Remove unnecessary mondrian.{ico,xpm} files from samples directory.
Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 17:42:33 +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
bced985eb0 Add a test of precisely sized status bar fields.
Modify the status bar sample to use two fields of just the right size for
their contents to confirm that this doesn't work correctly under at least MSW
currently (see #10696).

Notice that we need two fields because the behaviour/problem is different for
the last field and all the other ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-21 13:00:23 +00:00
Vadim Zeitlin
5eb65a3b70 Simplify the status bar sample by removing wxBitmapButton.
The sample code was complicated by having USE_STATIC_BITMAP and using
wxStaticBitmap or wxBitmapButton depending on it. Neither important for
a wxStatusBar sample so just use wxStaticBitmap always and make the code
simpler and more readable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-21 13:00:16 +00:00
Vadim Zeitlin
ee38a8cf7f Show status bar panes rectangles in the sample.
Display the rectangles returned by wxStatusBar::GetFieldRect() to be able to
visually check if they are correct.

See #10696.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-21 13:00:07 +00:00
Vadim Zeitlin
06a0d3eaaf Clean up status bar sample.
No real changes, just:
 - Fix code which couldn't compile in USE_MDI_PARENT_FRAME case
 - Use wxMenu::AppendCheckItem() instead of Append(..., true)
 - Remove unnecessary #ifdef __WXMAC__
 - Wrap excessively long lines

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-21 12:59:56 +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
1454b44261 Add test for Push/PopStatusText().
Allow to interactively push and pop status messages for the selected field.

This shows that currently PushStatusText() is completely broken under wxMSW
as it never shows the text being pushed at all because it is "optimized" away
due to an incorrect comparison with the old value (which turns out to be the
new one)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-06 00:00:47 +00:00
Vadim Zeitlin
dac831bb08 Provide saner UI for setting status bar fields.
Instead of asking the user to enter N values in a row (which is really
annoying even for N=2 already), allow to select the status bar to set the
value for and only show a single dialog asking for the value of this pane.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-06 00:00:39 +00:00
Vadim Zeitlin
41d6e8b683 No changes, just removed the whitespace.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-06 00:00:32 +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
Francesco Montorsi
c4c178c10d use wxSTB_ as prefix for wxStatusBar styles; add support for wxSTB_ELLIPSIZE_* flags under wxGTK; support wxSTB_SHOW_TIPS even if no ellipsization mode is active; update the sample to allow the user to choose the wxStatusBar style dynamically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-25 12:59:09 +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
Francesco Montorsi
778c9b9f49 commit temporary fix for the sample for 2.9.0 release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-19 01:37:11 +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
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
Francesco Montorsi
2a90b10068 allow the user to set the status bar font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 22:11:26 +00:00
Francesco Montorsi
ea6e41e45e use a single update UI handler for all menu commands which act only on the default status bar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 21:34:02 +00:00
Francesco Montorsi
41f02b9acc always call SetIcon() on the main frame of the sample; some small cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 01:01:00 +00:00
Francesco Montorsi
9df6b3b041 allow the user to set the contents of the status fields
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-07 17:40:22 +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
fd3ece5784 remove tabs added by error in previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-31 17:31:32 +00:00
Francesco Montorsi
54e18afcca allow the user to pass NULL for the status widths; this was a feature supported by generic and MSW status bar but was not documented; document it; add menu item in the statbar sample for testing it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-31 17:07:30 +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
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