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

removed unneeded duplication of DoSetSizeHints() in wxTLWBase (as wxWindow version already does the same thing) and made wxTLW::SetMin/MaxSize() implementation less verbose

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-03 00:25:46 +00:00
parent fdfebc6ac2
commit 49c9d05986
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/toplevel.h
View File

@@ -252,11 +252,6 @@ public:
virtual void SetMinSize(const wxSize& minSize); virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize); virtual void SetMaxSize(const wxSize& maxSize);
// set size hints for "window manager"
virtual void DoSetSizeHints( int minW, int minH,
int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
int incW = wxDefaultCoord, int incH = wxDefaultCoord );
protected: protected:
// the frame client to screen translation should take account of the // the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area // toolbar which may shift the origin of the client area

21
src/common/toplvcmn.cpp
View File

@@ -143,29 +143,12 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize) void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
{ {
SetSizeHints( minSize.x, minSize.y, GetMaxWidth(), GetMaxHeight() ); SetSizeHints(minSize, GetMaxSize());
} }
void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize) void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize)
{ {
SetSizeHints( GetMinWidth(), GetMinHeight(), maxSize.x, maxSize.y ); SetSizeHints(GetMinSize(), maxSize);
}
// set the min/max size of the window
void wxTopLevelWindowBase::DoSetSizeHints(int minW, int minH,
int maxW, int maxH,
int WXUNUSED(incW), int WXUNUSED(incH))
{
// setting min width greater than max width leads to infinite loops under
// X11 and generally doesn't make any sense, so don't allow it
wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
(minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
_T("min width/height must be less than max width/height!") );
m_minWidth = minW;
m_maxWidth = maxW;
m_minHeight = minH;
m_maxHeight = maxH;
} }
void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)