2002-07-15 Robert Collins <rbtcollins@hotmail.com>

[cygwin-apps/setup.git] / threebar.cc

diff --git a/threebar.cc b/threebar.cc
index 62ba57f3508de3bdab489d2ee34c2c94588afc0d..100056c47e400e02b60e73e69a6e7bdf3e22ee9e 100644 (file)
--- a/threebar.cc
+++ b/threebar.cc
@@ -25,9 +25,9 @@
 
 #include "propsheet.h"
 #include "threebar.h"
+#include "cistring.h"
 
-bool
-ThreeBarProgressPage::Create ()
+bool ThreeBarProgressPage::Create ()
 {
   return PropertyPage::Create (IDD_INSTATUS);
 }
@@ -52,19 +52,25 @@ ThreeBarProgressPage::OnInit ()
 void
 ThreeBarProgressPage::SetText1 (const TCHAR * t)
 {
-  SetWindowText (ins_action, t);
+  ::SetWindowText (ins_action, t);
 }
 
 void
 ThreeBarProgressPage::SetText2 (const TCHAR * t)
 {
-  SetWindowText (ins_pkgname, t);
+  ::SetWindowText (ins_pkgname, t);
 }
 
 void
 ThreeBarProgressPage::SetText3 (const TCHAR * t)
 {
-  SetWindowText (ins_filename, t);
+  ::SetWindowText (ins_filename, t);
+}
+
+void
+ThreeBarProgressPage::SetText4 (const TCHAR * t)
+{
+  ::SetWindowText (ins_bl_package, t);
 }
 
 void
@@ -79,6 +85,9 @@ ThreeBarProgressPage::SetBar2 (long progress, long max)
 {
   int percent = (int) (100.0 * ((double) progress) / (double) max);
   SendMessage (ins_iprogress, PBM_SETPOS, (WPARAM) percent, 0);
+  cistring s;
+  s.Format (IDS_CYGWIN_SETUP_WITH_PROGRESS, percent);
+  GetOwner ()->SetWindowText (s.c_str ());
 }
 
 void
@@ -126,7 +135,7 @@ ThreeBarProgressPage::OnActivate ()
 }
 
 bool
-ThreeBarProgressPage::OnMessageApp (UINT uMsg, WPARAM wParam, LPARAM lParam)
+  ThreeBarProgressPage::OnMessageApp (UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   switch (uMsg)
     {