different ScreenMessages sent on pop is expected to be a more commonly

used way of communicating between screens; make it easier to use.
This commit is contained in:
Glenn Maynard
2005-08-14 01:56:37 +00:00
parent 6c7a226c25
commit 74cbecfa7e
2 changed files with 5 additions and 2 deletions
+4 -2
View File
@@ -36,6 +36,8 @@ bool Screen::SortMessagesByDelayRemaining(const Screen::QueuedScreenMessage &m1,
void Screen::Init()
{
m_smSendOnPop = SM_None;
this->RunCommands( THEME->GetMetricA(m_sName, "ScreenInitCommand") );
vector<CString> asList;
@@ -197,13 +199,13 @@ void Screen::HandleScreenMessage( const ScreenMessage SM )
break;
case SM_GoToNextScreen:
if( SCREENMAN->IsStackedScreen(this) )
SCREENMAN->PopTopScreen( SM_None );
SCREENMAN->PopTopScreen( m_smSendOnPop );
else
SCREENMAN->SetNewScreen( GetNextScreen() );
break;
case SM_GoToPrevScreen:
if( SCREENMAN->IsStackedScreen(this) )
SCREENMAN->PopTopScreen( SM_None );
SCREENMAN->PopTopScreen( m_smSendOnPop );
else
SCREENMAN->SetNewScreen( GetPrevScreen() );
break;
+1
View File
@@ -79,6 +79,7 @@ protected:
// If these are left blank, the NextScreen and PrevScreen metrics will be used.
CString m_sNextScreen, m_sPrevScreen;
ScreenMessage m_smSendOnPop;
public: