Swap client data pointers in wxRearrangeList too.

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index ef7b89b24e5638af8739386a79e096422fee417a..3c962a0f2e57920a1519adb0880e5c50f9718888 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -139,11 +139,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
 
     m_parentTop = wxGetTopLevelParent(parent);
 
 
     m_parentTop = wxGetTopLevelParent(parent);
 

-    wxClientDC dc(this);
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    wxCoord widthText = 0;
-    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
-

     // top-level sizerTop
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
 
     // top-level sizerTop
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
 


@@ -313,6 +308,9 @@ wxProgressDialog::CreateLabel(const wxString& text, wxSizer *sizer)
 bool
 wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
 {
 bool
 wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
 {

+    if ( !DoBeforeUpdate(skip) )
+        return false;
+

     wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
 
 #ifdef __WXMSW__
     wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
 
 #ifdef __WXMSW__


@@ -428,7 +426,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
     }
     else // not at maximum yet
     {
     }
     else // not at maximum yet
     {

-        return DoAfterUpdate(skip);
+        DoAfterUpdate();

     }
 
     // update the display in case yielding above didn't do it
     }
 
     // update the display in case yielding above didn't do it


@@ -439,6 +437,9 @@ wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
 
 bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
 {
 
 bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
 {

+    if ( !DoBeforeUpdate(skip) )
+        return false;
+

     wxASSERT_MSG( m_gauge, wxT("cannot update non existent dialog") );
 
     // show a bit of progress
     wxASSERT_MSG( m_gauge, wxT("cannot update non existent dialog") );
 
     // show a bit of progress


@@ -455,13 +456,15 @@ bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
         SetTimeLabel((unsigned long)-1, m_remaining);
     }
 
         SetTimeLabel((unsigned long)-1, m_remaining);
     }
 

-    return DoAfterUpdate(skip);
+    DoAfterUpdate();
+
+    return m_state != Canceled;

 }
 
 }
 

-bool wxProgressDialog::DoAfterUpdate(bool *skip)
+bool wxProgressDialog::DoBeforeUpdate(bool *skip)

 {
     wxCHECK_MSG(wxEventLoopBase::GetActive(), false,
 {
     wxCHECK_MSG(wxEventLoopBase::GetActive(), false,

-                "wxProgressDialog::DoAfterUpdate needs a running event loop");
+                "wxProgressDialog::DoBeforeUpdate needs a running event loop");

 
     // 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
 
     // 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


@@ -481,6 +484,17 @@ bool wxProgressDialog::DoAfterUpdate(bool *skip)
     return m_state != Canceled;
 }
 
     return m_state != Canceled;
 }
 

+void wxProgressDialog::DoAfterUpdate()
+{
+    wxCHECK_RET(wxEventLoopBase::GetActive(),
+                "wxProgressDialog::DoAfterUpdate needs a running event loop");
+
+    // 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 wxProgressDialog::Resume()
 {
     m_state = Continue;
 void wxProgressDialog::Resume()
 {
     m_state = Continue;


@@ -621,8 +635,7 @@ void wxProgressDialog::ReenableOtherWindows()
 {
     if ( HasFlag(wxPD_APP_MODAL) )
     {
 {
     if ( HasFlag(wxPD_APP_MODAL) )
     {

-        delete m_winDisabler;
-        m_winDisabler = NULL;
+        wxDELETE(m_winDisabler);

     }
     else
     {
     }
     else
     {