Commit Graph

25 Commits

Author SHA1 Message Date
Steve Browne
59d26b0bad Keep disabled status when wxBitmapComboBox is recreated in wxMSW
If a disabled wxBitmapComboBox had to be recreated, it lost its disabled
status and became unexpectedly enabled.

Fix this by explicitly disabling it back in RecreateControl() if necessary.

Closes https://github.com/wxWidgets/wxWidgets/pull/376
2016-12-27 16:40:31 +01:00
Vadim Zeitlin
25c9b032a8 Don't call CacheBestSize() from DoGetBestSize() implementations
This is unnecessary, wxWindow::GetBestSize() already does this, so calling it
from DoGetBestSize() called by it too is just useless.
2016-04-03 18:04:26 +02:00
Artur Wieczorek
358e42a829 Fix drawing bitmap in the selection field of wxBitmapComboBox
When drop-down list is open for wxBitmapComboBox with wxCB_READONLY style and
keyboard is used to select the item on the list then the contents of the
selection field should remain unchanged. (Especially, the bitmap bitmap drawn
in the selection field should be the bitmap associated with text value
displayed in this field.)

Closes #17299.
2015-12-23 18:44:18 +01:00
Artur Wieczorek
79aea3a9a2 Fix inserting items into unsorted wxBitmapComboBox.
When wxBitmapComboBox::DoInsertItems() is called from
wxBitmapComboBox::RecreateControl() then the existing bitmap array should be
reused and new bitmaps shouldn't be allocated.

Closes https://github.com/wxWidgets/wxWidgets/pull/71
2015-08-14 13:59:08 +02:00
Artur Wieczorek
8a2239e409 Allow initializing sorted wxBitmapComboBox from an array.
When wxBitmapComboBox::DoInsertItems() is called and wxCB_SORT flag is set then
due to the sorting the position of the every element in the final item list
can be different than in the input table. To ensure consistency between item
list and bitmap array all new items should be added one by one. Based on the
actual index of every added item the bitmap array should be arranged
accordingly.

Closes #16627.
See https://github.com/wxWidgets/wxWidgets/pull/71
2015-08-14 13:57:56 +02:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Vadim Zeitlin
1d05c077a0 Use another bool constant instead of BOOL one in wxBitmapComboBox.
Just s/FALSE/false/

See #16690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-05 22:18:59 +00:00
Vadim Zeitlin
7e869a5d4d Measure wxBitmapComboBox height correctly if it has images.
This fixes a regression introduced in r77548 (see #14279): wxBitmapComboBox
must be higher than a normal wxComboBox if it has big enough bitmaps.

Closes #16690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-05 22:18:52 +00:00
Vadim Zeitlin
f9f31662a7 Use bool constants instead of BOOL ones in wxBitmapComboBox code.
Just s/TRUE/true/

See #14279.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-05 21:55:21 +00:00
Vadim Zeitlin
45e216bfe5 Fix empty wxBitmapComboBox height under wxMSW.
Make (initially) empty wxBitmapComboBox as high as a normal wxComboBox instead
of making it visibly shorter.

Closes #14279.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-05 21:55:17 +00:00
Vadim Zeitlin
76e7cfab8f Fix recreating of wxBitmapComboBox using untyped client data.
Use the correct array when restoring the client data, correcting a fatal typo
in the changes of r73880.

Closes #15436.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 14:33:09 +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
039d4cfb78 Fix VC6 compilation after r73880.
Work around the broken scoping for the variables declared inside for loops in
this compiler by declaring the loop variable once for all loops.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-29 23:53:15 +00:00
Vadim Zeitlin
9e86876e69 Fix assert when adding items with bitmaps wxBitmapComboBox.
The change of r73567 resulted in an assert when adding items with bitmaps to
wxBitmapComboBox without object client data. Fix the code added by this commit
to work for all kinds of client data, including wxClientData_None.

See #14892.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-29 23:13:24 +00:00
Vadim Zeitlin
4f082fb3a0 Preserve client data pointers when setting bitmaps in wxBitmapComboBox.
Changing the bitmap could recreate the control if the height of the bitmap
changed but recreating wxBitmapComboBox lost all the client data pointers.

Do preserve them now when recreating.

Closes #14892.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-24 13:48:49 +00:00
Vadim Zeitlin
05f5b3f745 Define wxBitmapComboBox::Insert(void* clientData) overload in wxMSW.
This overload was declared in the header but not implemented, do add its
definition too.

Closes #13774.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 23:52:43 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00
Jaakko Salli
df541b86f8 In wxBitmapComboBox::RecreateControl(), only call ChangeValue() if the control doesn't have wxCB_READONLY style (fixes #12859)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 17:58:09 +00:00
Jaakko Salli
4f320d7c57 Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 15:20:32 +00:00
Jaakko Salli
a9afb0576c In wxBitmapComboBox::RecreateControl(), always get recreated control's height from the best size, and also set the ComboBox item height with CB_SETITEMHEIGHT message (fixes #12515).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 10:51:50 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Jaakko Salli
41ce9ae1b0 Added wxMSW wxBitmapComboBox::DoGetBestSize(), which takes bitmap size into account.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-18 07:31:09 +00:00
Jaakko Salli
befee9b713 Fixed wxCB_SORT for wxMSW and generic wxBitmapComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-10 14:47:58 +00:00
Vadim Zeitlin
41fb347540 correct Id tags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 13:30:34 +00:00
Vadim Zeitlin
f696015cf1 native wxBitmapComboBox implementation for MSW (patch 1941399)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-17 22:43:00 +00:00