AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
59,915 Commits 1 Branch 0 Tags 297 MiB
2d3f617b34
Commit Graph

161 Commits

Author SHA1 Message Date
Paul Cornett
8b4ae731d3 use wxOVERRIDE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-30 00:02:23 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword. 
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-26 16:02:46 +00:00
Vadim Zeitlin
b712cc040f Fix wxIMAGE_QUALITY_HIGH definition. 
Embarrassingly, wxIMAGE_QUALITY_HIGH was never used as it had the same value
as wxIMAGE_QUALITY_BILINEAR due to the changes to these constants in r67203.

After fixing its value in the enum, also change the switch on this enum
elements to avoid g++ warnings about unhandled enum values.

See #12845, #15281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-29 12:51:47 +00:00
Vadim Zeitlin
31fb3cfe02 Replace wxT() with wxS() in image options definitions. 
The optimal way of creating a literal strings consisting of only ASCII
characters is to use wxS() as this avoids the need for run-time conversion in
all builds while wxT() requires a conversion from wchar_t to UTF-8 in UTF-8
builds. So replace wxT() with wxS() in wxImage options definitions.

Also remove wxT() from the options documentation, it's just useless there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-11-14 13:35:52 +00:00
Vadim Zeitlin
b6963858fb Added wxIMAGE_OPTION_ORIGINAL_{WIDTH,HEIGHT} wxImage options. 
These options allow to retrieve the original image size if the image was
scaled during load.

Closes #13662.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-11-14 13:35:48 +00:00
Dimitri Schoolwerth
fdb7d5bbc2 Changed behaviour of wxImageResizeQuality parameter in wxImage.Scale and wxImage.Rescale. 
Made the following changes:

* Formerly specifying to resize using wxIMAGE_QUALITY_BICUBIC or wxIMAGE_QUALITY_BILINEAR could result in the ResampleBox method being used. Now always resize with the method that the user actually specified.

* Added wxIMAGE_QUALITY_BOX_AVERAGE to explicitly allow resizing with the ResampleBox method.

* Previously wxIMAGE_QUALITY_HIGH was equal to wxIMAGE_QUALITY_BICUBIC. It has been changed to use wxIMAGE_QUALITY_BOX_AVERAGE when reducing the size of an image and wxIMAGE_QUALITY_BICUBIC in all other cases.

Closes #12845.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-15 16:42:34 +00:00
Vadim Zeitlin
d65e9d5707 Move "static" keyword out from wxDEPRECATED() macros to placate icc. 
Intel compiler gives warnings if the static keyword is not at the beginning of
the declaration and this happened when using it inside wxDEPRECATED() and
related macros because the declaration started with __declspec(deprecated) or
__attribute__((deprecated)) instead.

To avoid this problem, simply move "static" outside the macro.

Closes #12932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-19 12:32:59 +00:00
Vadim Zeitlin
496dbbe76e No changes, just refactor common code in wxImage cloning functions. 
Extract code common to several wxImage methods creating new images based on an
existing one in a new MakeEmptyClone() method.

Closes #12682.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-16 22:37:59 +00:00
Vadim Zeitlin
8524dec372 Add wxImage::Rotate180() function. 
Closes #12679.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-14 01:02:35 +00:00
Vadim Zeitlin
878f28d8c8 Changed wxImage::ConvertAlphaToMask() return type to bool. 
Make this function more useful by returning true from it if alpha channel was
really converted to the mask by it.

Closes #12637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-02 11:57:09 +00:00
Vadim Zeitlin
90fbb09ae2 Add wxImage::ClearAlpha(). 
This simple method can be used to remove alpha channel from the image.

See #10915.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-09 13:15:20 +00:00
Julian Smart
198c264dbc Applied part of #10034: wxImage::ConvertToDisabled() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-24 20:05:33 +00:00
Vadim Zeitlin
180f3c7461 Add support for bilinear resize algorithm to wxImage. 
Add wxIMAGE_QUALITY_BILINEAR in addition to the existing wxIMAGE_QUALITY_BICUBIC,
it is supposed to be much faster yet yield almost the same results.

Closes #11034.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-30 21:11:37 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space. 
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-21 10:41:26 +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
48889bca6f include wx/arrstr.h as it's needed by wxImageHandler and may not be implicitly included from other headers in minimal builds (closes #10914) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-19 23:46:21 +00:00
Francesco Montorsi
8faef7ccbc document that CanRead() and GetImageCount() functions of wxImageHandlers do NOT modify the current stream position and that they require seekable streams; rename current GetImageCount() functions to DoGetImageCount() and put save-and-restore stream position logic in GetImageCount(); add comments in the various DoCanRead() and in DoGetImageCount() where the stream position is modified; remove unneeded SeekI(0) calls from DoCanRead() and DoGetImageCount() functions: they didn't allow to load images from non-seekable streams; implement forward-seeking in wxInputStream::SeekI() also for non-seekable streams 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-01 11:43:36 +00:00
Vadim Zeitlin
099c2c7d7f correct typo in SetAltExtensions() method (re-closes #10570) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-18 10:04:20 +00:00
Francesco Montorsi
72a9034bd4 add overloads of ctors and Create() functions taking wxSize; document the various Create() overloads; reorganize wxImage docs categorizing the various functions 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-14 13:28:28 +00:00
Vadim Zeitlin
ba4800d3ae add support for multiple extensions to wxImage handlers (closes #10570) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-09 23:13:34 +00:00
Vadim Zeitlin
c1099d9254 allow specifying the mask colour in wxImage::ConvertAlphaToMask() (closes #10143) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-25 17:23:39 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Francesco Montorsi
fc3762b5fc add wxImage::Clear (patch by troelsk); closes #10141 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-09 15:35:59 +00:00
Francesco Montorsi
c74b07ac26 provide GetSize() getters in wxBitmap and wxImage 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 22:29:29 +00:00
Vadim Zeitlin
36abe9d421 added the possibility to rescale the image during loading, especially useful with JPEGs (#8390) (change to the sample accidentally committed as r56820) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-17 13:54:42 +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
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
Vadim Zeitlin
9d1c7e8474 add wxImage::SetType() and use it in animation decoders (#9639) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-02 20:13:41 +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
9e0560c1bc provide deprectaed LoadFile() and FindHandler() overloads taking long, otherwise the existing code using long instead of wxBitmapType doesn't compile because of the ambiguity between long->wxBitmapType and long->wxString conversions (as these methods are also overloaded to take wxString) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-24 23:43:59 +00:00
Vadim Zeitlin
591d3fa210 remember the last type used for loading or saving the image and return it from GetType() (#9551) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-11 00:28:23 +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
24904055f3 made Blur() methods const (bug 180914) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-07 17:02:12 +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
361f4288eb added support for image resolution options to PNG handler (heavily modified patch 1704128) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-21 19:29:01 +00:00
Vadim Zeitlin
55ccdb93e4 COW cleanup patch (1583966): 
1. perform deep comparison for the classes for which it makes sense in the
   ports where this wasn't done yet
2. remove (shallow) comparison operators for the classes for which it does
   not make sense (such as wxBitmap)
3. makes wxBitmap use COW on all ports
4. adds wxObject::IsRefTo()
5. centralizes and improves COW docs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 19:26:48 +00:00
Paul Cornett
29b7b6caad fix for Borland 5.5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-29 20:36:43 +00:00
Vadim Zeitlin
3af706cc31 added TGA handler (somewhat modified patch 1393912) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-29 18:58:25 +00:00
Vadim Zeitlin
b7cacb43db add IsOk() to all classes having Ok() method (patch 1570985) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 21:56:55 +00:00
Paul Cornett
452418c4b0 Move some things to wxBitmapBase to avoid much duplication. 
Use proper const for XPM data, and const void* for arbitary bitmap data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 08:04:49 +00:00
Robert Roebling
6f5d78250c Move wxVariant support for GDI classes to their 
files (and thus away from wxBase).
  Add export declaration field for variant macros.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-30 20:45:15 +00:00
Robert Roebling
07aaa1a4b8 [ 1537065 ] wxImage: Higher quality scaling/sampling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-24 12:47:16 +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
Paul Cornett
a0f81e9f15 use AllocExclusive in wxImage 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-17 19:09:28 +00:00
Vadim Zeitlin
f8855e4725 great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-09 00:51:23 +00:00
Julian Smart
ec85956ae9 Applied patch [ 1339764 ] Add wxImage::ConvertToGreyscale 
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-19 09:55:15 +00:00
Julian Smart
3f5c62f982 Reverted semicolons patch 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-18 16:45:41 +00:00