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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/wincmn.cpp
View File

@@ -470,6 +470,15 @@ void wxWindowBase::Fit()
//else: do nothing if we have no children
}
// fits virtual size (ie. scrolled area etc.) around children
void wxWindowBase::FitInside()
{
if ( GetChildren().GetCount() > 0 )
{
SetVirtualSize( GetBestVirtualSize() );
}
}
// return the size best suited for the current window
wxSize wxWindowBase::DoGetBestSize() const
{
@@ -593,8 +602,6 @@ void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
m_maxVirtualWidth = maxW;
m_minVirtualHeight = minH;
m_maxVirtualHeight = maxH;
SetVirtualSize( GetClientSize() );
}
void wxWindowBase::DoSetVirtualSize( int x, int y )
@@ -1757,10 +1764,16 @@ void wxWindowBase::UpdateWindowUI()
#if wxUSE_TEXTCTRL
wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl);
if ( text )
text->SetValue(event.GetText());
{
if ( event.GetText() != text->GetValue() )
text->SetValue(event.GetText());
}
else
#endif // wxUSE_TEXTCTRL
control->SetLabel(event.GetText());
{
if ( event.GetText() != control->GetLabel() )
control->SetLabel(event.GetText());
}
}
}