don't add XPM handler in wxInitAllImageHandlers() because it had been already edited...

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 4b5dcd7e75faeb17b01353e5fc99723579fcfe3f..39bb6d1ef836590aada25bf296c93e7884babc6b 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -67,19 +67,17 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
 BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
 
 BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
 

-    EVT_SHOW(wxProgressDialog::OnShow)
-

     EVT_CLOSE(wxProgressDialog::OnClose)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
 
 // ============================================================================
     EVT_CLOSE(wxProgressDialog::OnClose)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
 
 // ============================================================================

-// implementation
+// wxProgressDialog implementation

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxProgressDialog
+// wxProgressDialog creation

 // ----------------------------------------------------------------------------
 
 wxProgressDialog::wxProgressDialog(wxString const &title,
 // ----------------------------------------------------------------------------
 
 wxProgressDialog::wxProgressDialog(wxString const &title,


@@ -110,7 +108,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     m_state = hasAbortButton ? Continue : Uncancelable;
     m_maximum = maximum;
 
     m_state = hasAbortButton ? Continue : Uncancelable;
     m_maximum = maximum;
 

-#ifdef __WXMSW__
+#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;
     // we can't have values > 65,536 in the progress control under Windows, so
     // scale everything down
     m_factor = m_maximum / 65536 + 1;


@@ -126,7 +124,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     wxLayoutConstraints *c;
 
     wxClientDC dc(this);
     wxLayoutConstraints *c;
 
     wxClientDC dc(this);

-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

     long widthText;
     dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
 
     long widthText;
     dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
 


@@ -214,23 +212,24 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         c = new wxLayoutConstraints;
 
         // Windows dialogs usually have buttons in the lower right corner
         c = new wxLayoutConstraints;
 
         // Windows dialogs usually have buttons in the lower right corner

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)

         c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
 #else // !MSW
         c->centreX.SameAs(this, wxCentreX);
 #endif // MSW/!MSW
         c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN);
 
         c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
 #else // !MSW
         c->centreX.SameAs(this, wxCentreX);
 #endif // MSW/!MSW
         c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN);
 

-        wxSize sizeBtn = wxButton::GetDefaultSize();
-        c->width.Absolute(sizeBtn.x);
-        c->height.Absolute(sizeBtn.y);
+        c->width.AsIs();
+        c->height.AsIs();

 
         m_btnAbort->SetConstraints(c);
 
 
         m_btnAbort->SetConstraints(c);
 

-        sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeBtn.y;
+        sizeDlg.y += 2*LAYOUT_Y_MARGIN + wxButton::GetDefaultSize().y;

     }
     }

-    else
+    else // no "Cancel" button
+    {

         m_btnAbort = (wxButton *)NULL;
         m_btnAbort = (wxButton *)NULL;

+    }

 
     SetAutoLayout(TRUE);
     Layout();
 
     SetAutoLayout(TRUE);
     Layout();


@@ -285,7 +284,7 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 
     // VZ: I like the labels be centered - if the others don't mind, you may
     //     remove "#ifdef __WXMSW__" and use it for all ports
 
     // 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__
+#if defined(__WXMSW__) || defined(__WXPM__)

     c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
 #else // !MSW
     c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
     c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
 #else // !MSW
     c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);


@@ -308,6 +307,10 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
     return label;
 }
 
     return label;
 }
 

+// ----------------------------------------------------------------------------
+// wxProgressDialog operations
+// ----------------------------------------------------------------------------
+

 bool
 wxProgressDialog::Update(int value, const wxString& newmsg)
 {
 bool
 wxProgressDialog::Update(int value, const wxString& newmsg)
 {


@@ -319,7 +322,7 @@ 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 )
+    if ( m_gauge && value < m_maximum )

     {
         m_gauge->SetValue(value + 1);
     }
     {
         m_gauge->SetValue(value + 1);
     }


@@ -342,33 +345,44 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         SetTimeLabel(remaining, m_remaining);
     }
 
         SetTimeLabel(remaining, m_remaining);
     }
 

-    if ( (value == m_maximum ) && !(GetWindowStyle() & wxPD_AUTO_HIDE) )
+    if ( value == m_maximum )

     {
     {

-        if ( m_btnAbort )
+        // so that we return TRUE below and that out [Cancel] handler knew what
+        // to do
+        m_state = Finished;
+        if( !(GetWindowStyle() & wxPD_AUTO_HIDE) )

         {
         {

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

 #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);
-        }
+            else // enable the button to give the user a way to close the dlg
+            {
+                EnableCloseButton(TRUE);
+            }

 #endif // __WXMSW__
 
 #endif // __WXMSW__
 

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

 
 

-        // so that we return TRUE below and that out [Cancel] handler knew what
-        // to do
-        m_state = Finished;
+            wxYield();

 
 

-        wxYield();
+            (void)ShowModal();
+        }
+        else // auto 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();

 
 

-        (void)ShowModal();
+            Hide();
+        }

     }
     else
     {
     }
     else
     {


@@ -383,6 +397,15 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
     return m_state != Canceled;
 }
 
     return m_state != Canceled;
 }
 

+void wxProgressDialog::Resume()
+{
+    m_state = Continue;
+
+    // it may have been disabled by OnCancel(), so enable it back to let the
+    // user interrupt us again if needed
+    m_btnAbort->Enable();
+}
+

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


@@ -426,16 +449,6 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
     }
 }
 
     }
 }
 

-void wxProgressDialog::OnShow(wxShowEvent& event)
-{
-    // if the dialog is being hidden, it was closed, so reenable other windows
-    // now
-    if ( event.GetShow() )
-    {
-        ReenableOtherWindows();
-    }
-}
-

 // ----------------------------------------------------------------------------
 // destruction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // destruction
 // ----------------------------------------------------------------------------