X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8ab85ae7250169df40accb5e3e1ef3681e63ee9..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 65a8be784c..a48533d968 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -483,18 +483,7 @@ wxSize wxWindowBase::DoGetBestSize() const if ( m_windowSizer ) { - // Adjust to window size, since the return value of GetWindowSizeForVirtualSize is - // expressed in window and not client size - wxSize minSize = m_windowSizer->GetMinSize(); - wxSize size(GetSize()); - wxSize clientSize(GetClientSize()); - - wxSize minWindowSize(minSize.x + size.x - clientSize.x, - minSize.y + size.y - clientSize.y); - - best = GetWindowSizeForVirtualSize(minWindowSize); - - return best; + best = m_windowSizer->GetMinSize(); } #if wxUSE_CONSTRAINTS else if ( m_constraints ) @@ -2359,9 +2348,9 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxMessageBox(msg, _T("wxWidgets information"), wxICON_INFORMATION | wxOK, (wxWindow *)this); +#endif // wxUSE_MSGDLG } else -#endif // wxUSE_MSGDLG { event.Skip(); }