Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,871 Commits 1 Branch 330 Tags
20af6fd5d30a69ce61a527d1c0a57be7165e4321
Commit Graph

78 Commits

Author SHA1 Message Date
Vadim Zeitlin
20af6fd5d3 Remove wxDIB::m_hasAlpha from wxMSW. 
This field can't be set reliably as we don't know if LoadImage() Windows
function loaded an 0RGB or an RGB bitmap so remove it completely to avoid the
risk of using it wrongly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-24 22:40:27 +00:00
Vadim Zeitlin
254f9b4c3c Fix conversion of 32 bit ARGB bitmaps to wxImage in wxMSW. 
wxDIB::m_hasAlpha can't be trusted when the DIB was loaded from a file so
don't rely on it in wxDIB::ConvertToImage(). Instead, suppose that 32 bpp
bitmaps do have alpha channel and only get rid of it at the end of conversion
if it turns out that all alpha values were 0.

Closes #10133.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-24 22:40:22 +00:00
Vadim Zeitlin
715e4f7e3e Fix Cygwin 1.7 build. 
Avoid using Cygwin sockets as our code assumes that we use WinSock API under
Windows currently (this might change in the future) by defining
__USE_W32_SOCKETS.

Use new, safer and more efficient cygwin_conv_path() function.

Use t_str() instead of fn_str() with Windows API taking file names, under
Cygwin they are different and using fn_str() is incorrect.

A few other minor fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-23 23:32:46 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently. 
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-13 13:29:13 +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
Václav Slavík
0ed6c93314 fixed typo in error message 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-05-16 05:22:51 +00:00
Vadim Zeitlin
ee56d68c45 avoid unnecessary heap allocation of BITMAPINFO struct 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-30 16:31:31 +00:00
Vadim Zeitlin
f172cb8200 removed support for Salford compiler (which was almost certainly broken anyhow) (patch 1861133) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-31 10:05:00 +00:00
Vadim Zeitlin
c8aa3d8017 fixed off by 1 bug in converting premultiplied DIB pixel values to non-premultiplied image ones 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-05 22:58:27 +00:00
Vadim Zeitlin
a8ff046ba9 fixes for building wxMSW with --disbale-all-features 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-21 02:05:03 +00:00
Václav Slavík
e0a050e347 more changes to make wx compile without implicit wxString->char* conversion (for STL build) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-20 07:44:45 +00:00
Vadim Zeitlin
0deb5fab34 unmultiply by alpha when converting from wxDIB to wxImage as the former uses premultiplied alpha but the latter does not (patch 1597063) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-19 12:35: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
Włodzimierz Skiba
0bca037363 Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-14 10:02:19 +00:00
Włodzimierz Skiba
88a7a4e10e Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-25 14:38:19 +00:00
Vadim Zeitlin
0645e2b90a renamed GlobalPtr to GlobalPtrLock 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-29 11:17:28 +00:00
Włodzimierz Skiba
78a054f667 Code simplification and warning fixes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-18 13:43:42 +00:00
Włodzimierz Skiba
2e29e19e7e eVC3 build fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-01 13:06:47 +00:00
Mattia Barbon
146dcf3e22 Implemented loading 256-color bitmaps. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-06-21 20:17:42 +00:00
Julian Smart
2cef71bc23 Remove obsolete includes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-23 18:59:33 +00:00
Włodzimierz Skiba
373a5fb355 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@29697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-07 13:36:41 +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
Vadim Zeitlin
dd779a9e66 added wxDIB(HBITMAP) ctor and corresponding Create(); made GetData() return uchar * and not void * 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-22 11:43:57 +00:00
Vadim Zeitlin
45515b6685 don't suppose that all 32bpp DIBs have alpha, this is not true, the extra byte may be just padding 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-20 23:45:28 +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
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
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
Chris Elliott
7d5848668d fix DMars compilation to use precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-06-18 12:09:16 +00:00
Chris Elliott
e9196d9c63 update to make digitalmars compile/link html sample 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-04-24 21:07:02 +00:00
Vadim Zeitlin
3692b94818 fixes for Win95 (where GetObject(DIBSECTION) is broken) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-04-14 00:59:48 +00:00
Vadim Zeitlin
06d0938900 renamed GlobalHandle class to GlobalPtr to avoid conflict with the Win32 function 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-04-13 21:58:59 +00:00
Vadim Zeitlin
a1e71b1032 warning fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-28 17:41:02 +00:00
Vadim Zeitlin
82ac3b0a42 wxDIB::Create(wxBitmap) shouldn't do any conversions if the bitmap is already a DIB section 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-24 22:58:50 +00:00
Vadim Zeitlin
a8beba7230 fixed converting BI_BITFIELDS bitmaps to DIBs (fixes 589416) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-24 22:08:53 +00:00
Chris Elliott
4b1f929cc3 fix bug in Borland (bcc32 really hates ?) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-24 12:47:41 +00:00
Chris Elliott
4c49b5d83e fix bug in Borland (bcc32 really hates ?) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-24 08:44:08 +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
22be0335df got rid of more duplicated code for working with DIBs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-23 15:51:37 +00:00
Vadim Zeitlin
c11bf84234 added CreateDDB() and CreatePalette() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-23 01:46:31 +00:00
Vadim Zeitlin
bbc1265c40 create the DIBs in correct (and not down up) line order 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-22 19:01:27 +00:00
Julian Smart
1cfa5d8e39 Some code tidying; removing dibutils.cpp which 
doesn't seem to be used any more


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-18 15:08:21 +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
Vadim Zeitlin
53eff2a282 new wxDIB class 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-04 02:15:29 +00:00
Julian Smart
b4da152ea3 Removed old __WXWINE__ support (obsoleted by new __WINE__ symbol) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-07 18:11:53 +00:00
Vadim Zeitlin
f7f50f493b return NULL from the functions returning a pointer, not FALSE (patch 544557) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-04-16 08:57:36 +00:00
George Tasker
7527fdd873 Fixed incorrect deletion of hPalette if the call to wxReadDIB() fails 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-02 22:54:38 +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
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