Commit Graph

195 Commits

Author SHA1 Message Date
Vadim Zeitlin
7af64aace1 don't crash in UngetRawData() if it is invalid; fixed rounding errors in alpha premultiplying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 16:23:40 +00:00
Vadim Zeitlin
cc37ebe090 don't return garbage from GetRawBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 15:58:47 +00:00
Vadim Zeitlin
98ea6b7d6a added missing wxBitmap(w, h, dc) ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 15:52:14 +00:00
Vadim Zeitlin
106c33bb1d fix alpha premultiplying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:09:00 +00:00
Vadim Zeitlin
13c13ecbbf premultiply the colours by the alpha value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:02:17 +00:00
Vadim Zeitlin
10b41b53cb added wxBitmap::UseAlpha()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 13:45:20 +00:00
Vadim Zeitlin
2b254edf9c added wxDIB::Save() and wxDIB to/from wxBitmap) conversions, use them instead of the old C functions (the latter were removed, there is no old code left any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 21:33:21 +00:00
Vadim Zeitlin
f2bb16493d removed GetBitmapForDC() and supporting functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 14:27:34 +00:00
Vadim Zeitlin
b0ea5d9603 added CopyFromDIB()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:45:37 +00:00
Vadim Zeitlin
211b54b109 added wxBitmapToHICON/CURSOR helper functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 23:47:06 +00:00
Vadim Zeitlin
2cf45d6944 modifications for raw bitmap support and for using DIBs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:02:05 +00:00
Julian Smart
6c9a19aaba Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:23:28 +00:00
Mattia Barbon
3ca22d5e92 Fix release build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 21:07:50 +00:00
Vadim Zeitlin
acf8e3d29e start of alpha transparency support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 02:12:28 +00:00
Vadim Zeitlin
8bbbae215c made wxBitmapRefData private (actually, this also fixes some bug so it's not absolutely gratitious, but I already closed the bug not knowing that my cvs checkin was going to timeout and die and don't remember any more what it was...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:43:02 +00:00
Vadim Zeitlin
e30285abc6 compilation fixes for non default wxUSE_XXX values (patch 662781)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:20:46 +00:00
Vadim Zeitlin
0becd47010 support for using DIBs for wxBitmap implementation (patch 649866)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:28:56 +00:00
Guillermo Rodriguez Garcia
9b601c243f Removed compilation warnings (mostly mismatches between the format string
for debug/trace printfs and the actual parameters, e.g. int vs long, etc)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-26 21:12:25 +00:00
Vadim Zeitlin
f423f4dbbb use PALETTERGB instead of RGB when creating wxMask from colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-28 00:37:52 +00:00
Václav Slavík
368d59f0d8 don't use deprecated wxImage methods inside wxWin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-24 00:22:15 +00:00
Vadim Zeitlin
8e9ff81573 fixed incorrect calls to SelectObject(hdc, NULL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-05 01:34:29 +00:00
Vadim Zeitlin
59ff46cb36 create masks even (slightly) faster
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-23 11:47:22 +00:00
Vadim Zeitlin
51ddb341ee sped up the mask creation by a factor of 40
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-23 01:56:08 +00:00
Julian Smart
62e1ba759a More tweaks to wxMicroWi
More tweaks to MicroWindows


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-22 19:43:44 +00:00
Julian Smart
54a96d029f More tinkering
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-21 18:15:53 +00:00
Julian Smart
e640f8231f MicroWindows tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-21 17:01:02 +00:00
Vadim Zeitlin
e22c13fe7e fixes for compilation with wxUSE_PALETTE=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-25 00:22:07 +00:00
Vadim Zeitlin
7ecb8b06ad don't use wxTheXXXList in wxXXX ctor/dtor, only objects explicitly created
with FindOrCreateXXX() are managed by the lists


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-20 18:40:03 +00:00
Mattia Barbon
25acfd4ca3 Fixed wxMask::Create(bitmap,colour)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-30 20:52:35 +00:00
Vadim Zeitlin
68f36a2ca1 fixed resource leak in wxBitmap::CopyFromIconOrCursor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-18 23:29:09 +00:00
Kendall Bennett
19193a2c85 Mutiple updates from SciTech for wxWindows including the following:
1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-17 22:25:56 +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
Vadim Zeitlin
4d24ece719 removed incorrect 'static' keyword from var declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 12:32:48 +00:00
Julian Smart
8cb172b4f1 Various wxUniversal/wxMicroWindows fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 13:22:19 +00:00
Julian Smart
04ef50df3a First pass at adding MicroWindows support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 10:58:59 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Václav Slavík
c59b4b010e changed wxBitmap::CreateFromXpm to use wxBitmap(wxImage,int) ctor again -- it should work fine with BCC now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-16 22:07:59 +00:00
Julian Smart
940718f06e Misc release-related mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-14 10:28:27 +00:00
Václav Slavík
f204026b42 fixed fatal bug in wxBitmap::CreateFromXpm (the bitmap was added twice to wxTheBitmapsList)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-10 15:08:45 +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
Vadim Zeitlin
6d51f22029 some ifdef's - now it might compile without wxUSE_IMAGE although not tested
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 23:31:42 +00:00
Václav Slavík
2aeec9eccc applied fix to fix BCC's wxBitmap ctor problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 18:04:34 +00:00
Julian Smart
c447ce1745 Ok() should be called on image, not bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 12:44:48 +00:00
Václav Slavík
097aeb9903 fixed typos in wxBitmap::ConvertToImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-05 16:35:18 +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
Vadim Zeitlin
8c1375b922 fixed bug 128581
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 17:05:05 +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
Vadim Zeitlin
0bafad0cf4 1. some fixes for the problems reported by BoundsChecker
2. filled rectangles without outline are one pixel taller/wider


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-01 01:22:00 +00:00
Vadim Zeitlin
a58a12e9b7 1. fixed (?) blitting bitmaps with mask
2. fixed wxWindowBase compilation (oops)
3. fixed kbd handling in wxScrolledWindow under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-26 00:01:27 +00:00
Vadim Zeitlin
3c1a88d8b8 several mingw32 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-24 20:19:39 +00:00