Merge from PROGRESS_19980920_BRANCH

git-svn-id: svn://10.0.0.236/branches/PROGRESS_19981006_BRANCH@12054 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/cmd/winfe/cfe.cpp

@@ -100,12 +100,14 @@ void CFE_AllConnectionsComplete(MWContext *pContext)	{
 	} else 
 #endif   
     {
+#if !defined(SMOOTH_PROGRESS)
 		// Set the progress to be complete.
         // We don't like this message in Composer, so use a blank line instead
         if( EDT_IS_EDITOR(pContext) )
     		FE_Progress(pContext, " ");
         else
 		    FE_Progress(pContext, szLoadString(IDS_DOC_DONE));
+#endif
 	}
 
     ABSTRACTCX(pContext)->AllConnectionsComplete(pContext);

mozilla/cmd/winfe/cxabstra.cpp

@@ -46,6 +46,10 @@
 #include "mozilla.h"
 #include "timing.h"
 
+#if defined(SMOOTH_PROGRESS)
+#include "progress.h"
+#endif
+
 CAbstractCX::CAbstractCX()  {
 //	Purpose:    Constructor for the abstract base class.
 //	Arguments:  void
@@ -156,6 +160,11 @@ void CAbstractCX::DestroyContext()	{
         //  This lock is removed in the destructor.
         AfxOleLockApp();
 
+#if defined(SMOOTH_PROGRESS)
+        // Destroy the progress manager if one exists.
+        PM_ReleaseProgressManager(m_pXPCX);
+#endif
+
 	    //	Have the document interrupt.
 	    //	We call again when we get the mocha complete callback, but that 
         //      causes us to get deleted physically after the destroyed flag 
@@ -672,6 +681,9 @@ int CAbstractCX::GetUrl(URL_Struct *pUrl, FO_Present_Types iFormatOut, BOOL bRea
         			int iOldInProcessNet = winfeInProcessNet; 
         			winfeInProcessNet = TRUE;
         			StartAnimation();
+#if defined(SMOOTH_PROGRESS)
+                    PM_EnsureProgressManager(GetContext());
+#endif
 					if ( m_cxType == IconCX)
         				iRetval = NET_GetURL(pUrl, iFormatOut, GetContext(), Icon_GetUrlExitRoutine);
 					else {

mozilla/cmd/winfe/cxstubs.cpp

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
@@ -24,6 +24,9 @@
 #endif
 #include "timer.h"
 #include "dialog.h"
+#if defined(SMOOTH_PROGRESS)
+#include "progress.h"
+#endif
 
 CStubsCX::CStubsCX()    {
 //	Purpose:    Create a CStubCX
@@ -241,6 +244,9 @@ STDMETHODIMP_(ULONG) CStubsCX::Release(void)
 }
 
 void CStubsCX::AllConnectionsComplete(MWContext *pContext)	{
+#if defined(SMOOTH_PROGRESS)
+    PM_ReleaseProgressManager(pContext);
+#endif
 }
 
 void CStubsCX::UpdateStopState(MWContext *pContext) {

mozilla/cmd/winfe/mkfiles32/mozilla.mak

@@ -777,6 +777,9 @@ CDEFINES=/DXP_PC /Dx386 /D_WINDOWS /D_X86_ \
 !endif
 !if defined(MOZ_LIBTEST)
 	/DLAYPROBE_API \
+!endif
+!if defined(MOZ_SMOOTH_PROGRESS)
+        /DSMOOTH_PROGRESS \
 !endif
     /DMOZILLA_CLIENT