Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15929/src/mail
Modified Files:
MailFolderCC.cpp MailFolderCmn.cpp
Log Message:
changed MProgressDialog to take flags, as wxProgressDialog does, not bool parameters
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.700
retrieving revision 1.701
diff -b -u -2 -r1.700 -r1.701
--- MailFolderCC.cpp 12 May 2004 21:54:20 -0000 1.700
+++ MailFolderCC.cpp 13 Jul 2004 23:28:56 -0000 1.701
@@ -667,6 +667,10 @@
m_msgProgress.Printf(_("Retrieving %lu message headers..."), m_nTotal);
- m_progdlg = new MProgressDialog(name, m_msgProgress + _T("\n\n"), m_nTotal,
- NULL, false, true);
+ m_progdlg = new MProgressDialog
+ (
+ name,
+ m_msgProgress + _T("\n\n"),
+ m_nTotal
+ );
}
@@ -1097,5 +1101,8 @@
(
_("Retrieving data from server"),
- msg
+ msg,
+ 100,
+ NULL,
+ 0 // no flags
);
}
Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -b -u -2 -r1.133 -r1.134
--- MailFolderCmn.cpp 11 Jul 2004 12:55:44 -0000 1.133
+++ MailFolderCmn.cpp 13 Jul 2004 23:28:56 -0000 1.134
@@ -741,5 +741,5 @@
n, fileName0.empty() ? fileName.c_str() : fileName0.c_str());
- pd.reset(new MProgressDialog(GetName(), msg, 2*n, NULL));
+ pd.reset(new MProgressDialog(GetName(), msg, 2*n));
}
@@ -752,6 +752,6 @@
if ( msg )
{
- if ( pd )
- pd->Update( 2*i + 1 );
+ if ( pd && !pd->Update( 2*i + 1 ) )
+ break;
if ( !msg->WriteToString(tmpstr) )
@@ -765,6 +765,6 @@
}
- if ( pd )
- pd->Update( 2*i + 2);
+ if ( pd && !pd->Update( 2*i + 2) )
+ break;
}
}
@@ -822,8 +822,5 @@
mf->GetName(), // title
msg, // label message
- 2*n, // range
- NULL, // parent
- false, // disable parent only
- true // allow aborting
+ 2*n // range
));
}
@@ -953,10 +950,5 @@
msg.Printf(_("Searching in %lu messages..."), nMessages);
- progDlg = new MProgressDialog(GetName(),
- msg,
- nMessages,
- NULL,
- false /* disable parent only */,
- true /* allow to abort */);
+ progDlg = new MProgressDialog(GetName(), msg, nMessages);
}
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
