From: Vadim Zeitlin Date: Mon, 21 May 2001 00:16:35 +0000 (+0000) Subject: fixed wxComboBox sizing problem again X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/889f0b7c67f207f230d8bf9f558ae35445d57e10 fixed wxComboBox sizing problem again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 3a1877a303..e8460b2ae7 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -84,9 +84,6 @@ public: WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXHWND GetEditHWND() const; - -protected: - virtual wxSize DoGetBestSize() const; }; #endif // wxUSE_COMBOBOX diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 67cfabde1b..fafda5dd76 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -190,7 +190,7 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) { case WM_CHAR: return HandleChar(wParam, lParam, TRUE /* isASCII */); - + case WM_KEYDOWN: 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 // wxUSE_COMBOBOX