Vadim Zeitlin
2c0a4e08a3
fixed VC++ warning
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 12:18:49 +00:00
Václav Slavík
1de1d24e96
removed XPM handler from wxImage's standard handlers, let's see if it does any harm
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 21:03:25 +00:00
Václav Slavík
64e9f56b80
fixed Vadim's removal of XPM handler
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:20:49 +00:00
Julian Smart
088117622c
Checked for stream validity in wxImage::GetImageCount.
...
use horse3.ani in image sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 10:19:00 +00:00
Vadim Zeitlin
2b5f62a0b2
merged 2.4 branch into the trunk
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Vadim Zeitlin
39d16996b7
restore the stream position in wxImageHandler itself instead of forcing all
...
derived classes to do it themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-22 23:14:47 +00:00
Robert Roebling
fdbb06ba2c
wxImage::Copy() didn't really just copy the
...
image, it sometimes changed the mask
colour, when it was unused. This patch
makes life easier.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-22 21:01:54 +00:00
Vadim Zeitlin
79fa23744b
check the return code of wxStream::Read() in wxImageHandler::DoCanRead()
...
and avoid reading uninitialized memory when it fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-18 12:41:51 +00:00
Gilles Depeyrot
1b0674f799
corrected warnings when compiling with -Wall -W
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-03 19:49:20 +00:00
Julian Smart
0fa784572f
Separated wxImage::FloodFill from image.cpp
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-01 22:14:42 +00:00
Julian Smart
b1699cd397
Applied FloodFill patch
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-01 21:40:42 +00:00
Václav Slavík
ef8f37e0db
surround deprecated wxImage methods in WXWIN_COMPATIBILITY_2_2
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-25 23:25:53 +00:00
Václav Slavík
45647dcf10
Chris' wxImage::SaveFile(filename_only) patch
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-17 11:35:32 +00:00
Václav Slavík
36aac19594
previous change to wxImage was wrong, it didn't account for saving same image twice
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-16 11:37:50 +00:00
Václav Slavík
fd94e8aa45
A couple of changes to wxImage:
...
1. changed wxBMP_foo, wxCUR_foo to wxIMAGE_OPTION_{BMP,CUR}_foo
(with backward compatiblity macros, of course)
2. applied Chris' patch to update hotspot when scaling an image
3. applied Chris' patch to write a filename in XPM and generalized it
to pass wxIMAGE_OPTION_FILENAME to all saving handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-16 01:45:30 +00:00
Václav Slavík
e0a76d8d8a
make more wxImage methods const
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-08 00:17:25 +00:00
Václav Slavík
952ae1e88b
changed wxImage::ComputeHistogram to use wxHashMap
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-07 18:11:39 +00:00
Vadim Zeitlin
77fac225ba
fixed compilation without wxUSE_STREAMS
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-05 00:14:00 +00:00
Václav Slavík
649d13e837
fixing effects of my lack of English skills: GetImagesCount back to GetImageCount
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-02 17:09:43 +00:00
Václav Slavík
60d43ad883
support for multiple images in one file
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-01 23:13:37 +00:00
Václav Slavík
1f5b2017df
fine-tuned API from the ICO patch
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-20 23:55:44 +00:00
Robert Roebling
52b64b0a78
Applied Chris' patch for support for ICO loading.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-18 09:43:06 +00:00
Vadim Zeitlin
d275c7eb84
added wxUSE_PALETTE and fixed compilation with it set to 0
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-30 22:06:39 +00:00
Robert Roebling
eeca3a4697
The Scale() code in the 2.3 tree turned out to
...
be wrong.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-18 18:17:23 +00:00
Václav Slavík
9731a5fe6c
added #ifdef wxUSE_XPM around XPM handler initialization
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:08:46 +00:00
Vadim Zeitlin
6721fc3852
restored (and slightly improved) wxImage::Scale() fix
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-15 01:30:21 +00:00
Kendall Bennett
d80207c344
Reverted wxFileSystem changes to image.cpp and dib.cpp
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-14 20:09:35 +00:00
Vadim Zeitlin
6c28fd3379
fixed indentation and warnings/bugs
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-14 15:16:45 +00:00
Kendall Bennett
716cd4107b
Commited latest SciTech changes into CVS. This includes updates to the
...
applet code (with changes copyright headers) as well as updates to the
wxImage and dib.cpp modules to use virtual file systems so that we can
load these objects from ZIP files correctly. The dib.cpp module was
also extensively cleaned up (although the DIB writing code does not
presently use file streams as we couldn't figure out if it was possible
to write to a ZIP file stream). The code has been tested and functions
correctly for both regular files and ZIP files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-12 18:52:03 +00:00
Robert Roebling
33611ebbd9
Applied wxImage::Scale() patch,
...
Added testing code for wxSplitterWindow bug.
Added testing code for OnEraseBackground things.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-11 20:03:00 +00:00
Václav Slavík
66e23ad208
switched to new XPM code in wxMSW
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-08 22:44:34 +00:00
Kendall Bennett
33ac7e6f01
Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
...
clean with this compiler. Hopefully I did this without breaking other
compilers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 19:48:15 +00:00
Václav Slavík
c96ea65713
added wxUSE_IMAGE; added write-only wxXPMHandler
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:31:53 +00:00
Václav Slavík
f515c25a2c
wxImage::ConvertToMono wasn't const - fixed
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-06 22:15:34 +00:00
Václav Slavík
fec19ea9ff
I moved platform specific code from wxImage to wxBitmap
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:25:06 +00:00
Gilles Depeyrot
5fde6fcc9b
corrections for final release of Mac OS X
...
applied patches proposed by Mark Newsam
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-01 20:42:05 +00:00
Vadim Zeitlin
de8c48cf46
wxImage::Ok() now returns false for images with 0 width or height
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-19 18:27:59 +00:00
Gilles Depeyrot
03e11df547
modifications for compilation under Mac OS X
...
applied patches extracted from submission by Marc Newsam (tested under Mac OS 9)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-15 21:51:14 +00:00
Robert Roebling
0a07a7d852
Added wxCommandEvent::IsSeection for listbox,
...
Applied patch for wxListBox::Set when sorting
Added new value rounding code (corrected for
negative values) to scrollbar and slider
Added ...TEXT_CHANGED event to wxSpinCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-16 10:02:47 +00:00
Robert Roebling
aa21b5090a
Merged sizer fix from stable branch
...
Added support for transparent wxImage::Paste()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-29 08:55:40 +00:00
Bryan Petty
3ca6a5f046
second merge of the 2.2 branch (RL)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
Julian Smart
5e5437e00b
Added Set/Get/HasOption members and moved palette to ref data class.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-29 11:44:57 +00:00
Julian Smart
3f4fc7967b
Added wxQuantize, wxSplashScreen, wxEffects & added palette to wxImage
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-28 17:53:25 +00:00
Bryan Petty
f6bcfd974e
merged 2.2 branch
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Julian Smart
68be9f090f
Added wxDragImage generic implementation and sample; added mask handling to Motif's
...
wxImage::ConvertToBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 11:05:49 +00:00
Julian Smart
f250631042
wxImage::Rotate corrections added; docview improvements (menus updated properly)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-20 12:40:08 +00:00
Guillermo Rodriguez Garcia
aadaf84128
Added missing Unref() in wxImage::Create()
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-18 16:15:17 +00:00
Guillermo Rodriguez Garcia
b5c91ac6b3
Partially rewrote rotation code due to a potential alignment problem
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 23:11:40 +00:00
Vadim Zeitlin
4aff28fc9b
1. exchanged binary ROPs wxSET/wxCLEAR meaning for wxMSW to match wxGTK
...
2. bug with multiline messages in wxLogGui fixed
3. wxLogGui visual enhancements (for MSW, don't know how it looks elsewhere)
4. fixed 2 nice (i.e. BIG) memory leaks in wxImage::Rotate()
5. modified the text sample to show the mouse events too
6. documented strange behaviour of LEAVE_WINDOW mouse event under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 02:41:07 +00:00
Guillermo Rodriguez Garcia
ad30de59f6
Added support for transparency in rotation code
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-10 13:27:07 +00:00