Commit Graph

182 Commits

Author SHA1 Message Date
Robin Dunn
0806fc2071 Convert alpha (if any) to mask in wxBitmapToIconOrCursor. Note that
it is possible to put alpha in the icon instead of using a mask, but I
don't have time to figure that out today.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 23:53:09 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Robin Dunn
5a60b5f041 When converting a wxIcon to a bitmap check if the icon has an alpha
channel and set the bitmap to use it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-25 17:06:58 +00:00
Vadim Zeitlin
ec023a6e0b added wxBitmap::GetMaskBitmap()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-27 17:47:39 +00:00
Vadim Zeitlin
eabd333355 fixed creation of the mask in wxImage -> wxBitmap conversion when bpp < 32 (patch 1052766)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 23:30:57 +00:00
Włodzimierz Skiba
907173e51d Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:21:57 +00:00
Vadim Zeitlin
e5d4ef7410 store bitmap data in premultiplied by alpha format in wxBitmap/wxDIB (patch 991172)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 14:03:52 +00:00
Włodzimierz Skiba
fcf90ee1b1 Source cleaning: whitespaces,-1/wxID_ANY,TRUE/true,FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-19 17:39:28 +00:00
Vadim Zeitlin
7b24e97518 fix for assert when copying bitmap in CloneRefData()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-29 09:39:52 +00:00
Vadim Zeitlin
7ff64980aa don't modify all wxBitmaps sharing the same wxBitmapRefData when SetMask() is called
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-23 18:52:18 +00:00
Vadim Zeitlin
6faac21b0b reimplemented wxBitmap::ConvertToImage() using wxDIB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 11:49:45 +00:00
Włodzimierz Skiba
7010702f63 WinCE fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 11:11:46 +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
003e6c07cc restored mask copying code when converting a wxBitmap to a wxImage (wxMSW only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-19 22:22:48 +00:00
Vadim Zeitlin
3cfd077ff8 don't create artificial alpha channel for all bitmaps (patch 949221)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-06 14:52:55 +00:00
Vadim Zeitlin
be69f971c4 enable wxDIB for Windows CE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-04 12:57:36 +00:00
Vadim Zeitlin
3a5bcc4db0 removed Win16 code (patch 905241), last version with remains of Win16 support tagged with BEFORE_WIN16_REMOVAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-28 13:10:14 +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
Robin Dunn
b4e7f826af Use a compatible bitmap if a depth of -1 is given
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 00:08:53 +00:00
Julian Smart
6463b9f539 Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 13:49:22 +00:00
Julian Smart
1169a91932 Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:33:01 +00:00
Vadim Zeitlin
289307fa14 free the DIB for raw bitmaps even if they don't use alpha channel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 12:51:50 +00:00
Vadim Zeitlin
999836aaca warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:28:15 +00:00
Julian Smart
e7222d659b Applied patch [ 805147 ] GDI objects are not deselected from DC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 16:08:47 +00:00
Václav Slavík
a3bf7524f3 removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:50:53 +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
Vadim Zeitlin
4104d2b331 initialize ICONINFO to avoid Purify warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 12:30:30 +00:00
Julian Smart
f07dc2e2a7 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 23:04:34 +00:00
Julian Smart
4676948b68 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 21:50:07 +00:00
Vadim Zeitlin
9ad19a2bde removed a now unnecessary line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 00:42:39 +00:00
Vadim Zeitlin
c8688869d9 better mask handling in wxBitmap to wxImage conversion (patch 754881)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 00:41:37 +00:00
Vadim Zeitlin
4b8ab2f93a use DIB, not DDB, when converting from an image with alpha channel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:54:16 +00:00
Chris Elliott
1e3c12d774 implement wxHAVE_RAW_BITMAP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 12:58:00 +00:00
Vadim Zeitlin
adf9e09990 missing #if's needed for compilation with some wxUSE_XXX set to 0 (patch 728413)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 16:52:17 +00:00
Vadim Zeitlin
b9bcaf117a new template-based more flexible and hopefully more efficient raw bitmap implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 01:46:05 +00:00
Vadim Zeitlin
fa275e8648 support raw access to DDBs as well as DIBs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 01:03:41 +00:00
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