AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removing unreached code (overriden)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2004-02-11 15:13:03 +00:00
parent 63ff6f538e
commit 439ddeba9d
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mac/carbon/control.cpp
View File

@ -214,6 +214,9 @@ void wxControl::SetLabel(const wxString& title)
wxSize wxControl::DoGetBestSize() const
{
if ( (ControlHandle) m_macControl == NULL )
return wxWindow::DoGetBestSize() ;
Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ;
int bestWidth, bestHeight ;
@ -235,18 +238,7 @@ wxSize wxControl::DoGetBestSize() const
}
}
if ( IsKindOf( CLASSINFO( wxButton ) ) )
{
bestWidth = m_label.Length() * 8 + 12 ;
if ( bestWidth < 70 )
bestWidth = 70 ;
}
else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
{
bestWidth = m_label.Length() * 8 ;
}
else
bestWidth = bestsize.right - bestsize.left ;
bestWidth = bestsize.right - bestsize.left ;
bestWidth += 2 * m_macHorizontalBorder ;
@ -462,8 +454,7 @@ void wxControl::MacAdjustControlRect()
m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
}
MacUpdateDimensions() ;
// UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
MacUpdateDimensions() ;
}
}

19
src/mac/control.cpp
View File

@ -214,6 +214,9 @@ void wxControl::SetLabel(const wxString& title)
wxSize wxControl::DoGetBestSize() const
{
if ( (ControlHandle) m_macControl == NULL )
return wxWindow::DoGetBestSize() ;
Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ;
int bestWidth, bestHeight ;
@ -235,18 +238,7 @@ wxSize wxControl::DoGetBestSize() const
}
}
if ( IsKindOf( CLASSINFO( wxButton ) ) )
{
bestWidth = m_label.Length() * 8 + 12 ;
if ( bestWidth < 70 )
bestWidth = 70 ;
}
else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
{
bestWidth = m_label.Length() * 8 ;
}
else
bestWidth = bestsize.right - bestsize.left ;
bestWidth = bestsize.right - bestsize.left ;
bestWidth += 2 * m_macHorizontalBorder ;
@ -462,8 +454,7 @@ void wxControl::MacAdjustControlRect()
m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
}
MacUpdateDimensions() ;
// UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
MacUpdateDimensions() ;
}
}