Commit Graph

71 Commits

Author SHA1 Message Date
Vadim Zeitlin
657a8a3598 first round of debug/release merge: introduce wxDEBUG_LEVEL, for now defined as 1 if __WXDEBUG__ is defined, i.e. no real changes; don't use __WXDEBUG__ in the headers to keep debug and release builds ABI-compatible; add functions to customize or disable asserts handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-21 23:36:37 +00:00
Francesco Montorsi
732d8c74f8 add wxSize overloads to wxBitmap ctors and to wxBitmap::Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-14 13:57:51 +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
Francesco Montorsi
cbea3ec6ae introduced wxICON_DEFAULT_TYPE and wxBITMAP_DEFAULT_TYPE; documented these default argument values; matched the wxBitmap and wxIcon interfaces to their real implementations; revised icon.h interface header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 20:03:14 +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
Francesco Montorsi
e86f2cc84a reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long" where possible; made them const-correct; introduce wxBITMAP_SCREEN_DEPTH instead of -1 for clearness (specially in the docs); remove wxBitmapHandler empty stubs and rename wxBitmapHandlerBase as wxBitmapHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-25 20:31:48 +00:00
Vadim Zeitlin
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 17:54:20 +00:00
Kevin Ollivier
18f2ae4965 Fix for wxMemoryDC::GetAsBitmap() not working on Windows.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-20 23:26:35 +00:00
Vadim Zeitlin
11f406f91f allow overriding automatic alpha detection during icon->bitmap conversions (slightly modified patch 1738168)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-21 22:56:07 +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
c1dc9f8394 removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 11:35:04 +00:00
Stefan Neis
459f812bad Generalized compilation fix for old compilers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-01 01:16:01 +00:00
Vadim Zeitlin
1b7c01c976 fix wxBitmap mask copying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 14:43:04 +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
Stefan Neis
4a4bf7eefb Compilation fix for old GCC versions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 08:07:51 +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
Paul Cornett
cb62a16afb revert last change, plus small cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 15:59:15 +00:00
Vadim Zeitlin
cfd8e74094 (probably wrong) fix for wxMSW linking errors introduced by last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 15:44:20 +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
Vadim Zeitlin
50a9dd77f5 provide stubs for conversion to/from image functions even when wxUSE_WXDIB==0, this allows to not test for it in other places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 23:23:00 +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
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +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
4dddb8a2dd fixed gcc warnings about not calling base class ctor explicitly in copy ctors (patch 1028986)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:36:12 +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
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
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
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
1202890513 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:38:21 +00:00
Julian Smart
086b3a5b02 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 21:43:57 +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
Chris Elliott
465b213606 digital mars compiler updated - test no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-23 15:29:57 +00:00
Chris Elliott
4ce1efe123 update to make digitalmars compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 18:15:17 +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
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
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
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
00e7a427a0 compilation fixes after applying DECLARE_NO_COPY_CLASS() patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:46:08 +00:00
Vadim Zeitlin
22f3361e1c use DECLARE_NO_COPY_CLASS() where applicable (patch 633384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:38:11 +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
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
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
Václav Slavík
fd85921189 I moved platform specific code from wxImage to wxBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:15:36 +00:00