Updated testconf

[wxWidgets.git] / src / generic / progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index f987808944002996ab054abece5762b78186ac23..542ffad1611044f8a836ce2189bb9174f8b83872 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -81,8 +81,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
    m_msg = new wxStaticText(this, -1, message);
    c = new wxLayoutConstraints;
 
    m_msg = new wxStaticText(this, -1, message);
    c = new wxLayoutConstraints;

-   c->left.SameAs(this, wxLeft, 10);
-   c->top.SameAs(this, wxTop, 10);
+   c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
+   c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN);

    c->width.AsIs();
    c->height.AsIs();
    m_msg->SetConstraints(c);
    c->width.AsIs();
    c->height.AsIs();
    m_msg->SetConstraints(c);


@@ -231,17 +231,17 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
 
       if (m_elapsed) 
       {
 
       if (m_elapsed) 
       {

-         s.Printf("%i:%02i:%02i", diff.GetHour(), diff.GetMinute(), diff.GetSecond());
+         s.Printf(_T("%i:%02i:%02i"), diff.GetHour(), diff.GetMinute(), diff.GetSecond());

          if (s != m_elapsed->GetLabel()) m_elapsed->SetLabel(s);
       }
       if (m_estimated) 
       {
          if (s != m_elapsed->GetLabel()) m_elapsed->SetLabel(s);
       }
       if (m_estimated) 
       {

-         s.Printf("%i:%02i:%02i", estim / (60 * 60), (estim / 60) % 60, estim % 60);
+         s.Printf(_T("%i:%02i:%02i"), estim / (60 * 60), (estim / 60) % 60, estim % 60);

          if (s != m_estimated->GetLabel()) m_estimated->SetLabel(s);
       }
       if (m_remaining) 
       {
          if (s != m_estimated->GetLabel()) m_estimated->SetLabel(s);
       }
       if (m_remaining) 
       {

-         s.Printf("%i:%02i:%02i", remai / (60 * 60), (remai / 60) % 60, remai % 60);
+         s.Printf(_T("%i:%02i:%02i"), remai / (60 * 60), (remai / 60) % 60, remai % 60);

          if (s != m_remaining->GetLabel()) m_remaining->SetLabel(s);
       }
    }
          if (s != m_remaining->GetLabel()) m_remaining->SetLabel(s);
       }
    }


@@ -254,12 +254,16 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
            m_btnAbort->SetLabel(_("Close"));
        }
 
            m_btnAbort->SetLabel(_("Close"));
        }
 

-       if ( !newmsg )
+/*I think the default should be the other way round. If the
+  application wants to set a "Done." message at the end, it should
+  supply it. Any serious objections to this change? Makes the
+  application programmers' work a little easier.
+  if ( !newmsg )

        {
            // also provide the finishing message if the application didn't
            m_msg->SetLabel(_("Done."));
        }
        {
            // also provide the finishing message if the application didn't
            m_msg->SetLabel(_("Done."));
        }

-
+*/

        m_state = Finished;
 
        // so that we return TRUE below
        m_state = Finished;
 
        // so that we return TRUE below