Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,548 Commits 1 Branch 330 Tags
d928f01967cec20e112cc9dde2162b147d8f1433
Commit Graph

39 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
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk. 
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-05-03 16:29:04 +00:00
Vadim Zeitlin
fd08ccd246 Make wxRefCounter non copyable. 
wxRefCounter copy ctor was wrong as the new object had the same reference
count as the old one instead of starting its life with reference count set to
1 as any new object should.

While we could fix its copy ctor, it seems to be better to forbid copying
wxRefCounter objects at all because the semantics of doing this is not obvious
and the compiler-generated copy ctor in the derived classes often doesn't do
what the code using it expects it to do, as was discovered by making
wxRefCounter non copyable: see the fixes in the previous commits.

To uncover all such bugs, make wxRefCounter and classes deriving from it non
copyable. If this uncovers more problems, they should be fixed by implementing
copying properly (and explicitly) in the derived classes.

Closes #12768.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-14 18:43:49 +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
b5c4f0dfd9 compilation fix for wxUSE_IMAGE=0 caseinclude/wx/iconbndl.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-15 11:24:50 +00:00
Vadim Zeitlin
c7f171ed4d Use wxFileInputStream if wxFFileInputStream is not available. 
Closes #11068.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-05 17:24:22 +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
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
Vadim Zeitlin
feaa5f91e5 fix wxIconBundle creation from multiimage files broken by r60852 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-02 16:22:49 +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
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 02:39:52 +00:00
Stefan Csomor
451a00f7d7 fixing typo, thanks to Angelo Mottola 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-22 13:19:14 +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
Stefan Csomor
26eef30437 OSX regrouping 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-29 19:47:40 +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
Paul Cornett
2a23042680 fix some warnings from GCC -Wextra 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-15 17:24:48 +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
6a7d4d7190 don't allocate m_refData unnecessarily 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-07 23:38:13 +00:00
Vadim Zeitlin
9fc3681aeb don't crash when IsEmpty() is called on invalid bundle; don't assert if GetIcon(-1) is called on an invalid or empty bundle as existing code expects to be able to do it 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-07 23:36:08 +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
Václav Slavík
2fd85ab3e8 avoid calling wxSystemSettings::GetMetric() from wxIconBundle::GetIcon() unless the returned value is really needed to choose from >1 icons 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-17 16:08:13 +00:00
Włodzimierz Skiba
155ecd4c42 Include wx/image.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-03 19:02:54 +00:00
Włodzimierz Skiba
923d28da0e Include wx/icon.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-21 21:45:44 +00:00
Julian Smart
64c288fa47 Compile with wxUSE_DYNLIB_CLASS and wxUSE_WXDIB set to 0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-21 16:47:30 +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
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
Dimitri Schoolwerth
1904aa72f0 Fixed compilation for !wxUSE_IMAGE as well as !wxUSE_TOOLBAR. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-16 23:27:54 +00:00
Julian Smart
7da6ab6e2e Cater for wxUSE_IMAGE=0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-11 10:59:07 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:46:53 +00:00
Mattia Barbon
ed39ff57b3 Remove unnecessary header dependencies. Fix resulting compilation 
problems for wxMSW, wxGTK, wxMotif, wxX11 and wxMac in default
configuration. Non-default configurations will probably need some more
fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-02-10 21:07:36 +00:00
Mattia Barbon
ab71cedf54 Create a new icon for each image in a file with multiple icons. 
Fixes a bug reported on wx-dev.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-06-15 15:04:07 +00:00
Mattia Barbon
8f69665389 Fix for broken BCC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-04-03 19:32:31 +00:00
Mattia Barbon
7efaed4de4 Fixed problems with wxFrame::SetIcons 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-28 20:51:55 +00:00
Stefan Csomor
d5309f5803 changed image.h include to be correct in all (precomp and non-precomp) cases 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-28 14:15:07 +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