better native types for carbon

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 224f40a593eff3943678d77b046625177adbd635..68b58cada4bddb235fd4ca662c0112834d681b98 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -411,6 +411,9 @@ wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
             //       should be no side-effects
             wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
 
             //       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();
         }
         else // auto hide
             (void)ShowModal();
         }
         else // auto hide


@@ -684,8 +687,6 @@ void wxProgressDialog::UpdateMessage(const wxString &newmsg)
     {
         m_msg->SetLabel(newmsg);
 
     {
         m_msg->SetLabel(newmsg);
 

-        Fit();   // adapt to the new label size
-

         // allow the window to repaint:
         // NOTE: since we yield only for UI events with this call, there
         //       should be no side-effects
         // allow the window to repaint:
         // NOTE: since we yield only for UI events with this call, there
         //       should be no side-effects