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

return the results of GetMin/MaxSize() from GetMin/MaxWidth/Height(); fix warnings about unused parameters in DoSetSizeHints()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-29 20:38:23 +00:00
parent a42588069c
commit b43503410c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/window.h
View File

@@ -403,9 +403,11 @@ public:
const wxSize& incSize=wxDefaultSize) const wxSize& incSize=wxDefaultSize)
{ DoSetSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y, incSize.x, incSize.y); } { DoSetSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y, incSize.x, incSize.y); }
virtual void DoSetSizeHints( int minW, int minH, virtual void DoSetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, int WXUNUSED(maxW), int WXUNUSED(maxH),
int incW = wxDefaultCoord, int incH = wxDefaultCoord ) { } int WXUNUSED(incW), int WXUNUSED(incH) )
{
}
// Methods for setting virtual size hints // Methods for setting virtual size hints
// FIXME: What are virtual size hints? // FIXME: What are virtual size hints?
@@ -418,17 +420,15 @@ public:
SetVirtualSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y); SetVirtualSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y);
} }
int GetMinWidth() const { return GetMinSize().x; }
int GetMinHeight() const { return GetMinSize().y; }
int GetMaxWidth() const { return GetMaxSize().x; }
int GetMaxHeight() const { return GetMaxSize().y; }
// Override this method to control the values given to Sizers etc. // Override these methods to impose restrictions on min/max size
virtual wxSize GetMaxSize() const { return wxSize( m_maxWidth, m_maxHeight ); } virtual wxSize GetMinSize() const { return wxSize(m_minWidth, m_minHeight); }
virtual wxSize GetMinSize() const { return wxSize( m_minWidth, m_minHeight ); } virtual wxSize GetMaxSize() const { return wxSize(m_maxWidth, m_maxHeight); }
// If a class doesn't override GetMinSize() or GetMaxSize()
// these values will be returned
int GetMinWidth() const { return m_minWidth; }
int GetMinHeight() const { return m_minHeight; }
int GetMaxWidth() const { return m_maxWidth; }
int GetMaxHeight() const { return m_maxHeight; }
void SetMinSize(const wxSize& minSize) { m_minWidth = minSize.x; m_minHeight = minSize.y; } void SetMinSize(const wxSize& minSize) { m_minWidth = minSize.x; m_minHeight = minSize.y; }
void SetMaxSize(const wxSize& maxSize) { m_maxWidth = maxSize.x; m_maxHeight = maxSize.y; } void SetMaxSize(const wxSize& maxSize) { m_maxWidth = maxSize.x; m_maxHeight = maxSize.y; }