Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wxComboBox sizing problem again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-21 00:16:35 +00:00
parent e6c3f404b8
commit 889f0b7c67
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/combobox.h
View File

@@ -84,9 +84,6 @@ public:
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
WXHWND GetEditHWND() const; WXHWND GetEditHWND() const;
protected:
virtual wxSize DoGetBestSize() const;
}; };
#endif // wxUSE_COMBOBOX #endif // wxUSE_COMBOBOX

15
src/msw/combobox.cpp
View File

@@ -190,7 +190,7 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
{ {
case WM_CHAR: case WM_CHAR:
return HandleChar(wParam, lParam, TRUE /* isASCII */); return HandleChar(wParam, lParam, TRUE /* isASCII */);
case WM_KEYDOWN: case WM_KEYDOWN:
return HandleKeyDown(wParam, lParam); return HandleKeyDown(wParam, lParam);
@@ -487,19 +487,6 @@ void wxComboBox::SetSelection(long from, long to)
} }
} }
wxSize wxComboBox::DoGetBestSize() const
{
// the choice calculates the horz size correctly, but not the vertical
// component: correct it
wxSize size = wxChoice::DoGetBestSize();
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
size.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
return size;
}
#endif #endif
// wxUSE_COMBOBOX // wxUSE_COMBOBOX