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

Don't pop explicitly changed status messages.

Browse Source 
Calls to SetStatusText() in between Push/PopStatusText() were simply lost
before, now the text explicitly changed by SetStatusText() is preserved by the
next call to PopStatusText().

This required adding a new virtual method, called DoUpdateStatusText(), which
is now implemented in all the derived classes instead of overriding
SetStatusText() (on the bright side, it doesn't need to do any checks already
done in the base class any more).

Also fix PushStatusText() to actually show the text being pushed at all under
wxMSW as a side effect.

And further reduce code duplication between wxStatusBarBase and the derived
classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-06 00:01:43 +00:00
parent 0751510c21
commit 6cf6897100
13 changed files with 210 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/generic/statusbr.cpp
View File

@@ -160,35 +160,17 @@ wxSize wxStatusBarGeneric::DoGetBestSize() const
return wxSize(width, height);
}
void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
void wxStatusBarGeneric::DoUpdateStatusText(int number)
{
wxASSERT_MSG( number >= 0, wxT("negative number of fields in wxStatusBar?") );
wxRect rect;
GetFieldRect(number, rect);
// this will result in a call to SetStatusWidths() and thus an update to our
// m_widthsAbs cache
wxStatusBarBase::SetFieldsCount(number, widths);
}
Refresh(true, &rect);
void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
{
wxCHECK_RET( (number >= 0) && ((size_t)number < m_panes.GetCount()),
wxT("invalid status bar field index") );
wxString oldText = GetStatusText(number);
if (oldText != text)
{
wxStatusBarBase::SetStatusText(text, number);
wxRect rect;
GetFieldRect(number, rect);
Refresh(true, &rect);
// it's common to show some text in the status bar before starting a
// relatively lengthy operation, ensure that the text is shown to the
// user immediately and not after the lengthy operation end
Update();
}
// it's common to show some text in the status bar before starting a
// relatively lengthy operation, ensure that the text is shown to the
// user immediately and not after the lengthy operation end
Update();
}
void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])