Fix generic wxSearchCtrl size/layout code.

Override DoGetBestClientSize() instead of DoGetBestSize(), as we're really
computing just the size of our contents and like this we don't need to hard
code platform-dependent border sizes in this control itself.

Also use the client size in LayoutControls() for the same reason. This also
makes it unnecessary to pass it the width and height as it can find them on
its own. And x and y were never used in the first place, so remove them too.

Finally, center the bitmaps vertically.

Closes #16422.

[This is the backport of r77083 from trunk.]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

This commit is contained in:

Vadim Zeitlin

2014-10-03 01:52:04 +00:00

parent 1f2a74014f

commit 46e1b4b805

3 changed files with 37 additions and 39 deletions

1

docs/changes.txt

View File

@@ -597,6 +597,7 @@ All (GUI):
 wxGTK:
 - Fix mouse handling in wxNotebook containing wxListCtrl (Charlie Fenton).
 - Fix layout of wxSearchCtrl to not truncate text in it.
 wxMSW:

Fix generic wxSearchCtrl size/layout code.

1 docs/changes.txt Unescape Escape View File

1

docs/changes.txt

View File