Commit Graph

83 Commits

Author SHA1 Message Date
Vadim Zeitlin
15d82f05e1 Also free internal handlers when wxMSW wxStaticBitmap is destroyed.
r76141 fixed the resource leak when wxStaticBitmap image was replaced by
another one but the leak still happened at the end, when the wxStaticBitmap
was destroyed.

Fix it there as well in the same way.

Closes #16068.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-14 19:21:03 +00:00
Vadim Zeitlin
44611572b5 Fix resource leak in wxMSW wxStaticBitmap when using RGBA icons.
Release the old handle if it wasn't freed by STM_SETIMAGE itself.

Closes #16068.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-13 16:19:55 +00:00
Vadim Zeitlin
eda112dbfa Fix display of bitmaps with alpha in wxStaticBitmap under MSW.
Avoid double alpha pre-multiplication by converting the bitmap into a non
pre-multiplied format before passing it to STM_SETIMAGE.

Closes #2395.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-29 22:24:27 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
05942059ef Refresh wxMSW wxStaticBitmap when its size changes.
As MSW native control centers the image, it must be entirely redrawn when the
area in which the image is centered changes, but it doesn't happen by default,
so do it ourselves explicitly.

Also explain that this centering behaviour is platform-specific and shouldn't
be relied upon.

Closes #4564.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-09 00:35:54 +00:00
Vadim Zeitlin
80a4659776 Use wxCLASSINFO() instead of deprecated CLASSINFO().
No real changes, just use the version of the macro with a "wx" prefix.

Closes #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:24 +00:00
Vadim Zeitlin
ae4375b878 Fix wxStaticBitmap best size calculation in wxMSW.
Take the control borders into account by overriding DoGetBestClientSize()
instead of DoGetBestSize().

Also invalidate the default best size computed before we have any valid image
when setting the initial image in Create().

Closes #4099.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:23:57 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +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
Vadim Zeitlin
9eb2347dc3 disable workaround for lack of alpha support in native static bitmap control for WinCE, apparently it breaks the display (#10093)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-27 18:15:19 +00:00
Vadim Zeitlin
b3f2ce1c3f check for comctl32.dll version and not OS one as an app running XP without manifest is still incapable of drawing bitmaps with alpha (still related to #8684)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-16 01:47:14 +00:00
Vadim Zeitlin
52d80ec642 use parent background and not ours unless one was explicitly set when manually drawing (related to #8684)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-16 01:30:32 +00:00
Václav Slavík
30724d046d compilation fix for pch-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-25 15:35:28 +00:00
Vadim Zeitlin
a73a4ab75e draw the bitmap manually under Win9x and 2000 because they don't support alpha transparency (but wxDC::DrawBitmap() does) (modified patch 1761598)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-06 00:51:38 +00:00
Julian Smart
dc797d8e1b More border rationalisation. GetDefaultBorder is now mostly defined in base class files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-13 12:10:34 +00:00
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 08:50:17 +00:00
Włodzimierz Skiba
cdccdfabb2 Include wx/window.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-04 07:57:04 +00:00
Julian Smart
4fe41ce625 Don't use Windows handles directly in headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 07:37:18 +00:00
Julian Smart
3dece6c4bc Applied patch [ 1382552 ] Fixes GDI-ressource leak in wxStaticBitmap
Robert N.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:08:59 +00:00
Vadim Zeitlin
333c869716 return a valid bitmap from GetBitmap() even if we created an icon internally
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 13:46: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
42b1fb630d generate mouse events for all static controls, not just wxStaticLine (patch 1276413 by Jamie Gadd)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 13:54:29 +00:00
Robin Dunn
31582e4e11 Patch #1203934: enable best size caching for MSW widgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-18 02:23:01 +00:00
Julian Smart
9dabade20b Make HTCLIENT code off by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-25 08:08:22 +00:00
Julian Smart
6aa0103384 Restored mouse sensitivity for static box and static bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-24 08:26:50 +00:00
Vadim Zeitlin
e3c55eb333 don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-19 02:29:42 +00:00
Włodzimierz Skiba
57f4f9255e Source cleaning: whitespaces, tabs, ::, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 01:53:42 +00:00
Włodzimierz Skiba
5cb598ae20 Fixes to warnings about assigning unused values.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-16 13:19:32 +00:00
Robin Dunn
9f88452895 * Implemented BestSize cache
* Added calls to InvalidateBestSize where things affecting BestSize
  are modified.  There are probably several other places where this
  still needs to be done...

* Added wxWindowBase::GetBestFittingSize that will merge the BestSize
  into the MinSize, (if any) and return the result.

* SetBestFittingSize will now only set the MinSize to the value that
  was passed to it, without merging in the BestSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-24 20:09:45 +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
af498247c5 make XTI compile with VC6 (patch 896614)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-15 22:51:57 +00:00
Robin Dunn
9d17ee60a5 Put back wxMSW's wxStaticBitmap::DoGetBestSize because GetBitmap (used
in base DoGBS) is not able to be called until the control is fully
constructed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-07 22:41:34 +00:00
Robin Dunn
b3fcfa4d89 wxStaticBitmapBase::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-07 21:47:04 +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
Julian Smart
c140b7e7c9 Applied patch [ 903619 ] Win64 and Itanium support
by Brian Palmer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 10:45:02 +00:00
Vadim Zeitlin
cb0afb2662 replaced wxNO_FULL_REPAINT_ON_RESIZE with wxFULL_REPAINT_ON_RESIZE in XTI declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 00:41:06 +00:00
Stefan Csomor
3ff066a4ec macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:19:40 +00:00
Julian Smart
bc9fb5723a Added some window style metadata
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 11:35:44 +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
Stefan Csomor
066f1b7a95 xti extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:30:46 +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
Julian Smart
fda7962d02 Applied patch [ 761138 ] Replaces references to wxT("") and _T("") with wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 08:36:14 +00:00
Vadim Zeitlin
65bc172c97 implemented GetDefaultBorder() in wxControl, override it in some controls which don't want to have sunken style by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:35:32 +00:00
Julian Smart
e0b9ad2982 Further border style corrections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 22:15:25 +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
6dd16e4f26 removed style parameter from MSWCreate(), it is unneeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:27:17 +00:00
Vadim Zeitlin
46a5e01e86 use SS_CENTERIMAGE to prevent wxStaticBitmap from stretching its bitmap; also a face lift for control creation code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 14:35:18 +00:00