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

moved wxWindow::GetBestSize implementation into DoGetBestSize to make it easier to support both prototypes in derived classes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-09-30 16:33:36 +00:00
parent 147d666989
commit 024f89f972
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/wincmn.cpp
View File

@@ -674,9 +674,9 @@ wxPoint wxWindowBase::GetClientAreaOrigin() const
}
// set the min/max size of the window
void wxWindowBase::SetSizeHints(int minW, int minH,
int maxW, int maxH,
int WXUNUSED(incW), int WXUNUSED(incH))
void wxWindowBase::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

10
src/mac/carbon/slider.cpp
View File

@@ -291,17 +291,17 @@ wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
/* This is overloaded in wxSlider so that the proper width/height will always be used
* for the slider different values would cause redrawing and mouse detection problems */
void wxSlider::SetSizeHints( int minW, int minH,
int maxW , int maxH ,
int incW , int incH )
void wxSlider::DoSetSizeHints( int minW, int minH,
int maxW , int maxH ,
int incW , int incH )
{
wxSize size = GetBestSize();
if(GetWindowStyle() & wxSL_VERTICAL) {
wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);
}
else {
wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);
}
}

10
src/mac/classic/slider.cpp
View File

@@ -272,17 +272,17 @@ void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bo
/* This is overloaded in wxSlider so that the proper width/height will always be used
* for the slider different values would cause redrawing and mouse detection problems */
void wxSlider::SetSizeHints( int minW, int minH,
int maxW , int maxH ,
int incW , int incH )
void wxSlider::DoSetSizeHints( int minW, int minH,
int maxW , int maxH ,
int incW , int incH )
{
wxSize size = GetBestSize();
if(GetWindowStyle() & wxSL_VERTICAL) {
wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);
}
else {
wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);
}
}

2
src/motif/mdi.cpp
View File

@@ -618,7 +618,7 @@ void wxMDIChildFrame::Lower(void)
wxWindow::Raise();
}
void wxMDIChildFrame::SetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
void wxMDIChildFrame::DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
{
}

8
src/motif/toplevel.cpp
View File

@@ -336,11 +336,11 @@ bool wxTopLevelWindowMotif::IsMaximized() const
return FALSE;
}
void wxTopLevelWindowMotif::SetSizeHints( int minW, int minH,
int maxW, int maxH,
int incW, int incH )
void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH,
int maxW, int maxH,
int incW, int incH )
{
wxTopLevelWindowBase::SetSizeHints( minW, minH, maxW, maxH, incW, incH );
wxTopLevelWindowBase::DoSetSizeHints( minW, minH, maxW, maxH, incW, incH );
int count = 0;
Arg args[6];

2
src/x11/window.cpp
View File

@@ -940,7 +940,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
#endif
}
void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
{
m_minWidth = minW;
m_minHeight = minH;