Commit Graph

30 Commits

Author SHA1 Message Date
Vadim Zeitlin
d928f01967 Fix setting frame icon when using non-standard icon sizes in wxMSW.
Set the closest (and larger, if possible) icon if the icon of exactly the
system icon size is not available. This fixes setting the icons when using
custom DPI settings under MSW as the standard icon size may be different from
the standard 32*32 in this case.

This also improves wxIconBundle::GetIcon() to make its behaviour when the icon
with exactly the given size is not found more flexible as a side effect.

Closes #13891.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-24 22:17:47 +00:00
Vadim Zeitlin
89e1de6441 Fix compilation of wxIconBundle in some particular minimal builds.
Let the code compile when wxUSE_STREAMS==1 but wxUSE_FILE and wxUSE_FFILE are
both 0.

Closes #10900.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-12 00:36:31 +00:00
Václav Slavík
e94be2b132 compilation fix for wxUSE_IMAGE=0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-15 11:25:11 +00:00
Vadim Zeitlin
b85b06e13d fix compilation without wxUSE_STREAMS (closes #10900)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 21:57:23 +00:00
Václav Slavík
cee875e329 add support for loading wxIconBundles from streams
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-29 21:19:40 +00:00
Vadim Zeitlin
7105649b88 add header required for PCH-less mingw32 compilation (closes #10196)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-18 14:41:45 +00:00
Stefan Csomor
70bf329592 fixing deprecated constructors for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-18 09:12:32 +00:00
Stefan Neis
d3b9a3fd36 Workaround for bug in gcc-3.1 through gcc-3.3 in handling deprecation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-30 21:21:49 +00:00
Paul Cornett
d2cb636a1f put wxIconArray back in header, it's used by wxFSVolume
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-26 16:34:22 +00:00
Paul Cornett
24af522c43 move wxIconArray declaration out of header, remove unneccessary copy ctor and assignment operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-26 06:34:34 +00:00
Robert Roebling
1473d17fe9 Fix warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-27 13:45:51 +00:00
Vadim Zeitlin
831b64f32f fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-26 11:16:40 +00:00
Vadim Zeitlin
0ddec397f6 more wxBitmapType-related backward compatibility fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-25 01:02:04 +00:00
Vadim Zeitlin
e98e625cbb change longs used for bitmap types to wxBitmapType (#9126)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-06 23:33:58 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-26 15:06:00 +00:00
Vadim Zeitlin
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 17:54:20 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-09 10:09:52 +00:00
Vadim Zeitlin
9b5933bcbc added GetIconOfExactSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-07 23:53:06 +00:00
Vadim Zeitlin
f718689984 added IsEmpty()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-07 23:04:15 +00:00
Vadim Zeitlin
527343602e 1. changed wxIconBundle to use m_refData and COW to make copying icon bundles
fast (which was needed for 2)
2. make it possible to return wxIconBundles from wxArtProvider
3. implement Mac-specific wxArtProvider doing (2)

(modified patch 1581960)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-07 19:59:51 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
7beb59f36c Source cleaning: whitespaces, tabs, -1/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 18:13:32 +00:00
Václav Slavík
62a9d04c7d WXDLLEXPORT correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-16 21:02:29 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Václav Slavík
1202890513 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:38:21 +00:00
Gilles Depeyrot
af49c4b8a2 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-31 11:29:13 +00:00
Gilles Depeyrot
d84afea9d1 corrected warnings when compiling with -Wall -W
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-07 21:58:27 +00:00
Stefan Csomor
32f96f742f corrected dynarray.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-28 14:14:00 +00:00
Mattia Barbon
f618020a15 wxIconBundle implementation.
wxTLW::SetIcons() properly implemented for wxMotif, wxGTK, wxMSW, wxX11, wxUniversal
Placeholders that just call SetIcon for wxOS2 and wxMac.
Regenerated makefiles.
Added hardwired wxSYS_ICON_X/Y = 32 for wxGTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 21:54:23 +00:00