Reverted bogus fix for bogus bug report #13402.

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index c6ca37e085d5493a04e66fa512ecefb7dcc23717..7f48ba31f331e4748683bf4f9c8f07800de91f1f 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        progdlgg.h
-// Purpose:     wxProgressDialog class
-// Author:      Karsten Ballüder
+// Name:        src/generic/progdlgg.cpp
+// Purpose:     wxGenericProgressDialog class
+// Author:      Karsten Ballueder

 // Modified by:
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     09.05.1999
 // RCS-ID:      $Id$

-// Copyright:   (c) Karsten Ballüder
-// Licence:     wxWindows license
+// Copyright:   (c) Karsten Ballueder
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "progdlgg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,228 +31,281 @@
     #include "wx/frame.h"
     #include "wx/button.h"
     #include "wx/stattext.h"
     #include "wx/frame.h"
     #include "wx/button.h"
     #include "wx/stattext.h"

-    #include "wx/layout.h"
+    #include "wx/sizer.h"

     #include "wx/event.h"
     #include "wx/gauge.h"
     #include "wx/intl.h"
     #include "wx/event.h"
     #include "wx/gauge.h"
     #include "wx/intl.h"

-    #include "wx/settings.h"

     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"

+    #include "wx/settings.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

-#include "wx/generic/progdlgg.h"
+#include "wx/progdlg.h"
+#include "wx/evtloop.h"

 
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------

 
 

-#define LAYOUT_X_MARGIN 8
-#define LAYOUT_Y_MARGIN 8
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+   device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+    #define wxLARGESMALL(large,small) small
+#else
+    #define wxLARGESMALL(large,small) large
+#endif

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// private functions
+// constants

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// update the label to show the given time (in seconds)
-static void SetTimeLabel(unsigned long val, wxStaticText *label);
+#define LAYOUT_MARGIN wxLARGESMALL(8,2)
+
+static const int wxID_SKIP = 32000;  // whatever

 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
-    EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
+BEGIN_EVENT_TABLE(wxGenericProgressDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL, wxGenericProgressDialog::OnCancel)
+    EVT_BUTTON(wxID_SKIP, wxGenericProgressDialog::OnSkip)

 
 

-    EVT_CLOSE(wxProgressDialog::OnClose)
+    EVT_CLOSE(wxGenericProgressDialog::OnClose)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
-

 // ============================================================================
 // ============================================================================

-// wxProgressDialog implementation
+// wxGenericProgressDialog implementation

 // ============================================================================
 
 // ============================================================================
 

+wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog)
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxProgressDialog creation
+// wxGenericProgressDialog creation

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxProgressDialog::wxProgressDialog(wxString const &title,
-                                   wxString const &message,
-                                   int maximum,
-                                   wxWindow *parent,
-                                   int style)
-                : wxDialog(parent, -1, title)
+void wxGenericProgressDialog::Init()

 {
     // we may disappear at any moment, let the others know about it
     SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
 
 {
     // we may disappear at any moment, let the others know about it
     SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
 

-    m_windowStyle |= style;
+    // Initialize all our members that we always use (even when we don't
+    // create a valid window in this class).
+
+    m_pdStyle = 0;
+    m_parentTop = NULL;
+
+    m_gauge = NULL;
+    m_msg = NULL;
+    m_elapsed =
+    m_estimated =
+    m_remaining = NULL;
+
+    m_state = Uncancelable;
+    m_maximum = 0;
+
+    m_timeStart = wxGetCurrentTime();
+    m_timeStop = (unsigned long)-1;
+    m_break = 0;
+
+    m_skip = false;
+
+#if !defined(__SMARTPHONE__)
+    m_btnAbort =
+    m_btnSkip = NULL;
+#endif
+
+    m_display_estimated =
+    m_last_timeupdate =
+    m_ctdelay = 0;
+
+    m_delay = 3;
+
+    m_winDisabler = NULL;
+    m_tempEventLoop = NULL;
+}
+
+wxGenericProgressDialog::wxGenericProgressDialog()
+                       : wxDialog()
+{
+    Init();
+}
+
+wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
+                                                 const wxString& message,
+                                                 int maximum,
+                                                 wxWindow *parent,
+                                                 int style)
+                       : wxDialog()
+{
+    Init();
+
+    Create( title, message, maximum, parent, style );
+}
+
+void wxGenericProgressDialog::SetTopParent(wxWindow* parent)
+{
+    m_parentTop = GetParentForModalDialog(parent, GetWindowStyle());
+}
+
+bool wxGenericProgressDialog::Create( const wxString& title,
+                                      const wxString& message,
+                                      int maximum,
+                                      wxWindow *parent,
+                                      int style )
+{
+    SetTopParent(parent);
+
+    m_parentTop = wxGetTopLevelParent(parent);
+    m_pdStyle = style;

 
 

-    bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
+    wxWindow* const
+        realParent = GetParentForModalDialog(parent, GetWindowStyle());
+
+    if (!wxDialog::Create(realParent, wxID_ANY, title))
+        return false;
+
+    SetMaximum(maximum);
+
+    // We need a running event loop in order to update the dialog and be able
+    // to process clicks on its buttons, so ensure that there is one running
+    // even if this means we have to start it ourselves (this happens most
+    // commonly during the program initialization, e.g. for the progress
+    // dialogs shown from overridden wxApp::OnInit()).
+    if ( !wxEventLoopBase::GetActive() )
+    {
+        m_tempEventLoop = new wxEventLoop;
+        wxEventLoop::SetActive(m_tempEventLoop);
+    }

 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //
     // FIXME: should probably have a (extended?) window style for this
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //
     // FIXME: should probably have a (extended?) window style for this

-    if ( !hasAbortButton )
+    if ( !HasPDFlag(wxPD_CAN_ABORT) )

     {
     {

-        EnableCloseButton(FALSE);
+        EnableCloseButton(false);

     }
 #endif // wxMSW
 
     }
 #endif // wxMSW
 

-    m_state = hasAbortButton ? Continue : Uncancelable;
-    m_maximum = maximum;
-
-#ifdef __WXMSW__
-    // we can't have values > 65,536 in the progress control under Windows, so
-    // scale everything down
-    m_factor = m_maximum / 65536 + 1;
-    m_maximum /= m_factor;
-#endif // __WXMSW__
-
-    m_parentTop = parent;
-    while ( m_parentTop && m_parentTop->GetParent() )
-    {
-        m_parentTop = m_parentTop->GetParent();
-    }
-
-    wxLayoutConstraints *c;
+#if defined(__SMARTPHONE__)
+    SetLeftMenu();
+#endif

 
 

-    wxClientDC dc(this);
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    long widthText;
-    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
+    m_state = HasPDFlag(wxPD_CAN_ABORT) ? Continue : Uncancelable;

 
 

-    m_msg = new wxStaticText(this, -1, message);
-    c = new wxLayoutConstraints;
-    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);
+    // top-level sizerTop
+    wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);

 
 

-    wxSize sizeDlg,
-           sizeLabel = m_msg->GetSize();
-    sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y;
+    m_msg = new wxStaticText(this, wxID_ANY, message);
+    sizerTop->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN);

 
 

-    wxWindow *lastWindow = m_msg;
+    int gauge_style = wxGA_HORIZONTAL;
+    if ( style & wxPD_SMOOTH )
+        gauge_style |= wxGA_SMOOTH;

 
 

-    if ( maximum > 0 )
-    {
-        // note that we can't use wxGA_SMOOTH because it happens to also mean
-        // wxDIALOG_MODAL and will cause the dialog to be modal. Have an extra
-        // style argument to wxProgressDialog, perhaps.
-        m_gauge = new wxGauge(this, -1, m_maximum,
-                              wxDefaultPosition, wxDefaultSize,
-                              wxGA_HORIZONTAL);
+#ifdef __WXMSW__
+    maximum /= m_factor;
+#endif

 
 

-        c = new wxLayoutConstraints;
-        c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
-        c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
-        c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
-        c->height.AsIs();
-        m_gauge->SetConstraints(c);
-        m_gauge->SetValue(0);
-        lastWindow = m_gauge;
+    m_gauge = new wxGauge
+                  (
+                    this,
+                    wxID_ANY,
+                    maximum,
+                    wxDefaultPosition,
+                    // make the progress bar sufficiently long
+                    wxSize(wxMin(wxGetClientDisplayRect().width/3, 300), -1),
+                    gauge_style
+                  );

 
 

-        wxSize sizeGauge = m_gauge->GetSize();
-        sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeGauge.y;
-    }
-    else
-        m_gauge = (wxGauge *)NULL;
+    sizerTop->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN);
+    m_gauge->SetValue(0);

 
     // create the estimated/remaining/total time zones if requested
 
     // create the estimated/remaining/total time zones if requested

-    m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
-
-    // if we are going to have at least one label, remmeber it in this var
-    wxStaticText *label = NULL;
+    m_elapsed =
+    m_estimated =
+    m_remaining = NULL;

 
     // also count how many labels we really have
     size_t nTimeLabels = 0;
 
 
     // also count how many labels we really have
     size_t nTimeLabels = 0;
 

+    wxSizer * const sizerLabels = new wxFlexGridSizer(2);
+

     if ( style & wxPD_ELAPSED_TIME )
     {
         nTimeLabels++;
 
     if ( style & wxPD_ELAPSED_TIME )
     {
         nTimeLabels++;
 

-        label =
-        m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow);
+        m_elapsed = CreateLabel(GetElapsedLabel(), sizerLabels);

     }
 
     if ( style & wxPD_ESTIMATED_TIME )
     {
         nTimeLabels++;
 
     }
 
     if ( style & wxPD_ESTIMATED_TIME )
     {
         nTimeLabels++;
 

-        label =
-        m_estimated = CreateLabel(_("Estimated time : "), &lastWindow);
+        m_estimated = CreateLabel(GetEstimatedLabel(), sizerLabels);

     }
 
     if ( style & wxPD_REMAINING_TIME )
     {
         nTimeLabels++;
 
     }
 
     if ( style & wxPD_REMAINING_TIME )
     {
         nTimeLabels++;
 

-        label =
-        m_remaining = CreateLabel(_("Remaining time : "), &lastWindow);
+        m_remaining = CreateLabel(GetRemainingLabel(), sizerLabels);

     }
     }

-
-    if ( nTimeLabels > 0 )
-    {
-        // set it to the current time
-        m_timeStart = wxGetCurrentTime();
-        sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_Y_MARGIN);
-    }
-
-    if ( hasAbortButton )
-    {
-        m_btnAbort = new wxButton(this, wxID_CANCEL, _("Cancel"));
-        c = new wxLayoutConstraints;
-
-        // Windows dialogs usually have buttons in the lower right corner
-#ifdef __WXMSW__
-        c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
+    sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);
+
+#if defined(__SMARTPHONE__)
+    if ( HasPDFlag(wxPD_CAN_SKIP) )
+        SetRightMenu(wxID_SKIP, _("Skip"));
+    if ( HasPDFlag(wxPD_CAN_ABORT) )
+        SetLeftMenu(wxID_CANCEL);
+#else
+    m_btnAbort =
+    m_btnSkip = NULL;
+
+    wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
+
+    // Windows dialogs usually have buttons in the lower right corner
+    const int sizerFlags =
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXOSX__)
+                           wxALIGN_RIGHT | wxALL

 #else // !MSW
 #else // !MSW

-        c->centreX.SameAs(this, wxCentreX);
+                           wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP

 #endif // MSW/!MSW
 #endif // MSW/!MSW

-        c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN);
+                           ;

 
 

-        c->width.AsIs();
-        c->height.AsIs();
-
-        m_btnAbort->SetConstraints(c);
+    if ( HasPDFlag(wxPD_CAN_SKIP) )
+    {
+        m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip"));

 
 

-        sizeDlg.y += 2*LAYOUT_Y_MARGIN + wxButton::GetDefaultSize().y;
+        buttonSizer->Add(m_btnSkip, 0, sizerFlags, LAYOUT_MARGIN);

     }
     }

-    else // no "Cancel" button
+
+    if ( HasPDFlag(wxPD_CAN_ABORT) )

     {
     {

-        m_btnAbort = (wxButton *)NULL;
+        m_btnAbort = new wxButton(this, wxID_CANCEL);
+
+        buttonSizer->Add(m_btnAbort, 0, sizerFlags, LAYOUT_MARGIN);

     }
 
     }
 

-    SetAutoLayout(TRUE);
-    Layout();
+    if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) )
+        buttonSizer->AddSpacer(LAYOUT_MARGIN);

 
 

-    sizeDlg.y += 2*LAYOUT_Y_MARGIN;
+    sizerTop->Add(buttonSizer, 0, sizerFlags, LAYOUT_MARGIN );
+#endif // __SMARTPHONE__/!__SMARTPHONE__

 
 

-    // try to make the dialog not square but rectangular of reasonabel width
-    sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3);
-    sizeDlg.x *= 3;
-    sizeDlg.x /= 2;
-    SetClientSize(sizeDlg);
+    SetSizerAndFit(sizerTop);

 
     Centre(wxCENTER_FRAME | wxBOTH);
 
 
     Centre(wxCENTER_FRAME | wxBOTH);
 

-    if ( style & wxPD_APP_MODAL )
-    {
-        m_winDisabler = new wxWindowDisabler(this);
-    }
-    else
-    {
-        if ( m_parentTop )
-            m_parentTop->Enable(FALSE);
-        m_winDisabler = NULL;
-    }
+    DisableOtherWindows();

 
 

-    Show(TRUE);
-    Enable(TRUE); // enable this window
+    Show();
+    Enable();

 
     // this one can be initialized even if the others are unknown for now
     //
 
     // this one can be initialized even if the others are unknown for now
     //


@@ -266,56 +315,119 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         SetTimeLabel(0, m_elapsed);
     }
 
         SetTimeLabel(0, m_elapsed);
     }
 

-    // Update the display (especially on X, GTK)
-    wxYield();
-    wxYield();
-
-#ifdef __WXMAC__
-    MacUpdateImmediately();
-#endif
+    Update();
+    return true;

 }
 
 }
 

-wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
-                                            wxWindow **lastWindow)
+void wxGenericProgressDialog::UpdateTimeEstimates(int value,
+                                                  unsigned long &elapsedTime,
+                                                  unsigned long &estimatedTime,
+                                                  unsigned long &remainingTime)

 {
 {

-    wxLayoutConstraints *c;
+    unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
+    if ( value != 0 && (m_last_timeupdate < elapsed || value == m_maximum) )
+    {
+        m_last_timeupdate = elapsed;
+        unsigned long estimated = m_break +
+                (unsigned long)(( (double) (elapsed-m_break) * m_maximum ) / ((double)value)) ;
+        if (    estimated > m_display_estimated
+                && m_ctdelay >= 0
+            )
+        {
+            ++m_ctdelay;
+        }
+        else if (    estimated < m_display_estimated
+                    && m_ctdelay <= 0
+                )
+        {
+            --m_ctdelay;
+        }
+        else
+        {
+            m_ctdelay = 0;
+        }
+        if (    m_ctdelay >= m_delay          // enough confirmations for a higher value
+                || m_ctdelay <= (m_delay*-1)     // enough confirmations for a lower value
+                || value == m_maximum            // to stay consistent
+                || elapsed > m_display_estimated // to stay consistent
+                || ( elapsed > 0 && elapsed < 4 ) // additional updates in the beginning
+            )
+        {
+            m_display_estimated = estimated;
+            m_ctdelay = 0;
+        }
+    }

 
 

-    wxStaticText *label = new wxStaticText(this, -1, _("unknown"));
-    c = new wxLayoutConstraints;
+    if ( value != 0 )
+    {
+        long display_remaining = m_display_estimated - elapsed;
+        if ( display_remaining < 0 )
+        {
+            display_remaining = 0;
+        }

 
 

-    // VZ: I like the labels be centered - if the others don't mind, you may
-    //     remove "#ifdef __WXMSW__" and use it for all ports
-#ifdef __WXMSW__
-    c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
-#else // !MSW
-    c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
-#endif // MSW/!MSW
-    c->top.Below(*lastWindow, LAYOUT_Y_MARGIN);
-    c->width.AsIs();
-    c->height.AsIs();
-    label->SetConstraints(c);
+        estimatedTime = m_display_estimated;
+        remainingTime = display_remaining;
+    }
+
+    elapsedTime = elapsed;
+}
+
+// static
+wxString wxGenericProgressDialog::GetFormattedTime(unsigned long timeInSec)
+{
+    wxString timeAsHMS;
+
+    if ( timeInSec == (unsigned long)-1 )
+    {
+        timeAsHMS = _("Unknown");
+    }
+    else
+    {
+        unsigned hours = timeInSec / 3600;
+        unsigned minutes = (timeInSec % 3600) / 60;
+        unsigned seconds = timeInSec % 60;
+        timeAsHMS.Printf("%u:%02u:%02u", hours, minutes, seconds);
+    }

 
 

-    wxStaticText *dummy = new wxStaticText(this, -1, text);
-    c = new wxLayoutConstraints;
-    c->right.LeftOf(label);
-    c->top.SameAs(label, wxTop, 0);
-    c->width.AsIs();
-    c->height.AsIs();
-    dummy->SetConstraints(c);
+    return timeAsHMS;
+}

 
 

-    *lastWindow = label;
+wxStaticText *
+wxGenericProgressDialog::CreateLabel(const wxString& text, wxSizer *sizer)
+{
+    wxStaticText *label = new wxStaticText(this, wxID_ANY, text);
+    wxStaticText *value = new wxStaticText(this, wxID_ANY, _("unknown"));
+
+    // select placement most native or nice on target GUI
+#if defined(__SMARTPHONE__)
+    // value and time to the left in two rows
+    sizer->Add(label, 1, wxALIGN_LEFT);
+    sizer->Add(value, 1, wxALIGN_LEFT);
+#elif defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXGTK20__)
+    // value and time centered in one row
+    sizer->Add(label, 1, wxLARGESMALL(wxALIGN_RIGHT,wxALIGN_LEFT) | wxTOP | wxRIGHT, LAYOUT_MARGIN);
+    sizer->Add(value, 1, wxALIGN_LEFT | wxTOP, LAYOUT_MARGIN);
+#else
+    // value and time to the right in one row
+    sizer->Add(label);
+    sizer->Add(value, 0, wxLEFT, LAYOUT_MARGIN);
+#endif

 
 

-    return label;
+    return value;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxProgressDialog operations
+// wxGenericProgressDialog operations

 // ----------------------------------------------------------------------------
 
 bool
 // ----------------------------------------------------------------------------
 
 bool

-wxProgressDialog::Update(int value, const wxString& newmsg)
+wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)

 {
 {

-    wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
+    if ( !DoBeforeUpdate(skip) )
+        return false;
+
+    wxCHECK_MSG( m_gauge, false, "dialog should be fully created" );

 
 #ifdef __WXMSW__
     value /= m_factor;
 
 #ifdef __WXMSW__
     value /= m_factor;


@@ -323,94 +435,237 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
 
     wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
 
 
     wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
 

-    if ( m_gauge )
-    {
-        m_gauge->SetValue(value + 1);
-    }
-
-    if ( !newmsg.IsEmpty() )
-    {
-        m_msg->SetLabel(newmsg);
+    m_gauge->SetValue(value);

 
 

-        wxYield();
-        wxYield();
-    }
+    UpdateMessage(newmsg);

 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
     {
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
     {

-        unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
-        unsigned long estimated = elapsed * m_maximum / value;
-        unsigned long remaining = estimated - elapsed;
+        unsigned long elapsed;
+        unsigned long display_remaining;
+
+        UpdateTimeEstimates( value,
+                             elapsed,
+                             m_display_estimated,
+                             display_remaining );

 
         SetTimeLabel(elapsed, m_elapsed);
 
         SetTimeLabel(elapsed, m_elapsed);

-        SetTimeLabel(estimated, m_estimated);
-        SetTimeLabel(remaining, m_remaining);
+        SetTimeLabel(m_display_estimated, m_estimated);
+        SetTimeLabel(display_remaining, m_remaining);

     }
 
     }
 

-    if ( (value == m_maximum ) )
+    if ( value == m_maximum )

     {
     {

-        // so that we return TRUE below and that out [Cancel] handler knew what
+        if ( m_state == Finished )
+        {
+            // ignore multiple calls to Update(m_maximum): it may sometimes be
+            // troublesome to ensure that Update() is not called twice with the
+            // same value (e.g. because of the rounding errors) and if we don't
+            // return now we're going to generate asserts below
+            return true;
+        }
+
+        // so that we return true below and that out [Cancel] handler knew what

         // to do
         m_state = Finished;
         // to do
         m_state = Finished;

-        if( !(GetWindowStyle() & wxPD_AUTO_HIDE) )
+        if( !HasPDFlag(wxPD_AUTO_HIDE) )

         {
         {

-            if ( m_btnAbort )
-            {
-                // tell the user what he should do...
-                m_btnAbort->SetLabel(_("Close"));
-            }
+            EnableClose();
+            DisableSkip();

 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

-            else // enable the close button to give the user a way to close the dlg
-            {
-                EnableCloseButton(TRUE);
-            }
+            EnableCloseButton();

 #endif // __WXMSW__
 
 #endif // __WXMSW__
 

-            if ( !newmsg )
+            if ( newmsg.empty() )

             {
                 // 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."));
             }
 

-            wxYield();
-            wxYield();
+            // allow the window to repaint:
+            // NOTE: since we yield only for UI events with this call, there
+            //       should be no side-effects
+            wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);

 
 

+            // NOTE: this call results in a new event loop being created
+            //       and to a call to ProcessPendingEvents() (which may generate
+            //       unwanted re-entrancies).

             (void)ShowModal();
         }
             (void)ShowModal();
         }

-        else
+        else // auto hide

         {
         {

-            Hide();
+            // reenable other windows before hiding this one because otherwise
+            // Windows wouldn't give the focus back to the window which had
+            // been previously focused because it would still be disabled

             ReenableOtherWindows();
             ReenableOtherWindows();

+
+            Hide();

         }
     }
         }
     }

-    else
+    else // not at maximum yet

     {
     {

-        // update the display
-        wxYield();
-        wxYield();
+        DoAfterUpdate();

     }
 
     }
 

-#ifdef __WXMAC__
-    MacUpdateImmediately();
-#endif
+    // update the display in case yielding above didn't do it
+    Update();

 
     return m_state != Canceled;
 }
 
 
     return m_state != Canceled;
 }
 

-void wxProgressDialog::Resume()
+bool wxGenericProgressDialog::Pulse(const wxString& newmsg, bool *skip)
+{
+    if ( !DoBeforeUpdate(skip) )
+        return false;
+
+    wxCHECK_MSG( m_gauge, false, "dialog should be fully created" );
+
+    // show a bit of progress
+    m_gauge->Pulse();
+
+    UpdateMessage(newmsg);
+
+    if (m_elapsed || m_remaining || m_estimated)
+    {
+        unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
+
+        SetTimeLabel(elapsed, m_elapsed);
+        SetTimeLabel((unsigned long)-1, m_estimated);
+        SetTimeLabel((unsigned long)-1, m_remaining);
+    }
+
+    DoAfterUpdate();
+
+    return m_state != Canceled;
+}
+
+bool wxGenericProgressDialog::DoBeforeUpdate(bool *skip)
+{
+    // we have to yield because not only we want to update the display but
+    // also to process the clicks on the cancel and skip buttons
+    // NOTE: using YieldFor() this call shouldn't give re-entrancy problems
+    //       for event handlers not interested to UI/user-input events.
+    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT);
+
+    Update();
+
+    if ( m_skip && skip && !*skip )
+    {
+        *skip = true;
+        m_skip = false;
+        EnableSkip();
+    }
+
+    return m_state != Canceled;
+}
+
+void wxGenericProgressDialog::DoAfterUpdate()
+{
+    // allow the window to repaint:
+    // NOTE: since we yield only for UI events with this call, there
+    //       should be no side-effects
+    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
+}
+
+void wxGenericProgressDialog::Resume()

 {
     m_state = Continue;
 {
     m_state = Continue;

+    m_ctdelay = m_delay; // force an update of the elapsed/estimated/remaining time
+    m_break += wxGetCurrentTime()-m_timeStop;
+
+    EnableAbort();
+    EnableSkip();
+    m_skip = false;
+}
+
+bool wxGenericProgressDialog::Show( bool show )
+{
+    // reenable other windows before hiding this one because otherwise
+    // Windows wouldn't give the focus back to the window which had
+    // been previously focused because it would still be disabled
+    if(!show)
+        ReenableOtherWindows();
+
+    return wxDialog::Show(show);
+}
+
+int wxGenericProgressDialog::GetValue() const
+{
+    wxCHECK_MSG( m_gauge, -1, "dialog should be fully created" );
+
+    return m_gauge->GetValue();
+}
+
+int wxGenericProgressDialog::GetRange() const
+{
+    return m_maximum;
+}
+
+wxString wxGenericProgressDialog::GetMessage() const
+{
+    return m_msg->GetLabel();
+}
+
+void wxGenericProgressDialog::SetRange(int maximum)
+{
+    wxCHECK_RET( m_gauge, "dialog should be fully created" );
+
+    wxCHECK_RET( maximum > 0, "Invalid range" );
+
+    m_gauge->SetRange(maximum);
+
+    SetMaximum(maximum);
+}
+
+void wxGenericProgressDialog::SetMaximum(int maximum)
+{
+    m_maximum = maximum;
+
+#if defined(__WXMSW__) || defined(__WXPM__)
+    // we can't have values > 65,536 in the progress control under Windows, so
+    // scale everything down
+    m_factor = m_maximum / 65536 + 1;
+#endif // __WXMSW__
+}
+
+
+bool wxGenericProgressDialog::WasCancelled() const
+{
+    return HasPDFlag(wxPD_CAN_ABORT) && m_state == Canceled;
+}

 
 

-    // it may have been disabled by OnCancel(), so enable it back to let the
-    // user interrupt us again if needed
-    m_btnAbort->Enable();
+bool wxGenericProgressDialog::WasSkipped() const
+{
+    return HasPDFlag(wxPD_CAN_SKIP) && m_skip;
+}
+
+// static
+void wxGenericProgressDialog::SetTimeLabel(unsigned long val,
+                                           wxStaticText *label)
+{
+    if ( label )
+    {
+        wxString s;
+
+        if (val != (unsigned long)-1)
+        {
+            s = GetFormattedTime(val);
+        }
+        else
+        {
+            s = _("Unknown");
+        }
+
+        if ( s != label->GetLabel() )
+            label->SetLabel(s);
+    }

 }
 
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 

-void wxProgressDialog::OnCancel(wxCommandEvent& event)
+void wxGenericProgressDialog::OnCancel(wxCommandEvent& event)

 {
     if ( m_state == Finished )
     {
 {
     if ( m_state == Finished )
     {


@@ -424,18 +679,28 @@ void wxProgressDialog::OnCancel(wxCommandEvent& event)
         // will handle it
         m_state = Canceled;
 
         // will handle it
         m_state = Canceled;
 

-        // update the button state immediately so that the user knows that the
+        // update the buttons state immediately so that the user knows that the

         // request has been noticed
         // request has been noticed

-        m_btnAbort->Disable();
+        DisableAbort();
+        DisableSkip();
+
+        // save the time when the dialog was stopped
+        m_timeStop = wxGetCurrentTime();

     }
 }
 
     }
 }
 

-void wxProgressDialog::OnClose(wxCloseEvent& event)
+void wxGenericProgressDialog::OnSkip(wxCommandEvent& WXUNUSED(event))
+{
+    DisableSkip();
+    m_skip = true;
+}
+
+void wxGenericProgressDialog::OnClose(wxCloseEvent& event)

 {
     if ( m_state == Uncancelable )
     {
         // can't close this dialog
 {
     if ( m_state == Uncancelable )
     {
         // can't close this dialog

-        event.Veto(TRUE);
+        event.Veto();

     }
     else if ( m_state == Finished )
     {
     }
     else if ( m_state == Finished )
     {


@@ -446,6 +711,10 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
     {
         // next Update() will notice it
         m_state = Canceled;
     {
         // next Update() will notice it
         m_state = Canceled;

+        DisableAbort();
+        DisableSkip();
+
+        m_timeStop = wxGetCurrentTime();

     }
 }
 
     }
 }
 


@@ -453,23 +722,42 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
 // destruction
 // ----------------------------------------------------------------------------
 
 // destruction
 // ----------------------------------------------------------------------------
 

-wxProgressDialog::~wxProgressDialog()
+wxGenericProgressDialog::~wxGenericProgressDialog()

 {
     // normally this should have been already done, but just in case
     ReenableOtherWindows();
 {
     // normally this should have been already done, but just in case
     ReenableOtherWindows();

+
+    if ( m_tempEventLoop )
+    {
+        wxEventLoopBase::SetActive(NULL);
+        delete m_tempEventLoop;
+    }

 }
 
 }
 

-void wxProgressDialog::ReenableOtherWindows()
+void wxGenericProgressDialog::DisableOtherWindows()

 {
 {

-    if ( GetWindowStyle() & wxPD_APP_MODAL )
+    if ( HasPDFlag(wxPD_APP_MODAL) )

     {
     {

-        delete m_winDisabler;
-        m_winDisabler = (wxWindowDisabler *)NULL;
+        m_winDisabler = new wxWindowDisabler(this);

     }
     else
     {
         if ( m_parentTop )
     }
     else
     {
         if ( m_parentTop )

-            m_parentTop->Enable(TRUE);
+            m_parentTop->Disable();
+        m_winDisabler = NULL;
+    }
+}
+
+void wxGenericProgressDialog::ReenableOtherWindows()
+{
+    if ( HasPDFlag(wxPD_APP_MODAL) )
+    {
+        wxDELETE(m_winDisabler);
+    }
+    else
+    {
+        if ( m_parentTop )
+            m_parentTop->Enable();

     }
 }
 
     }
 }
 


@@ -477,18 +765,64 @@ void wxProgressDialog::ReenableOtherWindows()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-static void SetTimeLabel(unsigned long val, wxStaticText *label)
+void wxGenericProgressDialog::EnableSkip(bool enable)

 {
 {

-    if ( label )
+    if ( HasPDFlag(wxPD_CAN_SKIP) )

     {
     {

-        wxString s;
-        unsigned long hours = val / 3600;
-        unsigned long minutes = (val % 3600) / 60;
-        unsigned long seconds = val % 60;
-        s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds);
+#ifdef __SMARTPHONE__
+        if(enable)
+            SetRightMenu(wxID_SKIP, _("Skip"));
+        else
+            SetRightMenu();
+#else
+        if(m_btnSkip)
+            m_btnSkip->Enable(enable);
+#endif
+    }
+}

 
 

-        if ( s != label->GetLabel() )
-            label->SetLabel(s);
+void wxGenericProgressDialog::EnableAbort(bool enable)
+{
+    if( HasPDFlag(wxPD_CAN_ABORT) )
+    {
+#ifdef __SMARTPHONE__
+        if(enable)
+            SetLeftMenu(wxID_CANCEL); // stock buttons makes Cancel label
+        else
+            SetLeftMenu();
+#else
+        if(m_btnAbort)
+            m_btnAbort->Enable(enable);
+#endif
+    }
+}
+
+void wxGenericProgressDialog::EnableClose()
+{
+    if(HasPDFlag(wxPD_CAN_ABORT))
+    {
+#ifdef __SMARTPHONE__
+        SetLeftMenu(wxID_CANCEL, _("Close"));
+#else
+        if(m_btnAbort)
+        {
+            m_btnAbort->Enable();
+            m_btnAbort->SetLabel(_("Close"));
+        }
+#endif
+    }
+}
+
+void wxGenericProgressDialog::UpdateMessage(const wxString &newmsg)
+{
+    if ( !newmsg.empty() && newmsg != m_msg->GetLabel() )
+    {
+        m_msg->SetLabel(newmsg);
+
+        // allow the window to repaint:
+        // NOTE: since we yield only for UI events with this call, there
+        //       should be no side-effects
+        wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);

     }
 }
 
     }
 }