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 3a1877a3038b1aa5ea70e53ef2a4a9b0f0032a1a..e8460b2ae77c52a3b56f72ea32c274685dda2b7a 100644 (file)
--- 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;
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     WXHWND GetEditHWND() const;

-
-protected:
-    virtual wxSize DoGetBestSize() const;

 };
 
 #endif // wxUSE_COMBOBOX
 };
 
 #endif // wxUSE_COMBOBOX

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 67cfabde1bcb6b5988375035dfb0810d08a377c7..fafda5dd76996655adddea010c129dfdabb31d64 100644 (file)
--- 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_CHAR:
             return HandleChar(wParam, lParam, TRUE /* isASCII */);

-                       
+

         case WM_KEYDOWN:
             return HandleKeyDown(wParam, lParam);
 
         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
 
 #endif
  // wxUSE_COMBOBOX