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

don't override GetMinWidth/Height() which are non-virtual any more, override GetMinSize() instead

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-29 20:39:31 +00:00
parent adf45b5d48
commit 894057d1dd
4 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/univ/topluniv.cpp
View File

@@ -303,26 +303,15 @@ long wxTopLevelWindow::HitTest(const wxPoint& pt) const
return m_renderer->HitTestFrame(rect, pt+GetClientAreaOrigin(), GetDecorationsStyle());
}
int wxTopLevelWindow::GetMinWidth() const
wxSize wxTopLevelWindow::GetMinSize() const
{
wxSize size = wxTopLevelWindowNative::GetMinSize();
if ( !m_usingNativeDecorations )
{
return wxMax(wxTopLevelWindowNative::GetMinWidth(),
m_renderer->GetFrameMinSize(GetDecorationsStyle()).x);
size.IncTo(m_renderer->GetFrameMinSize(GetDecorationsStyle()));
}
else
return wxTopLevelWindowNative::GetMinWidth();
}
int wxTopLevelWindow::GetMinHeight() const
{
if ( !m_usingNativeDecorations )
{
return wxMax(wxTopLevelWindowNative::GetMinHeight(),
m_renderer->GetFrameMinSize(GetDecorationsStyle()).y);
}
else
return wxTopLevelWindowNative::GetMinHeight();
return size;
}
// ----------------------------------------------------------------------------