1. changed wxColourData default palette to NULL colours instead of white

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 2efd26e2a392a23833d9b6625dab99a6ea454bea..b38e80e3a5c53939b2bb8db758fd7ea6b8cb2761 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -144,8 +144,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     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
+        // note that we can't use wxGA_SMOOTH because it happens to
+        // cause the dialog to be modal. Have an extra
         // style argument to wxProgressDialog, perhaps.
         m_gauge = new wxGauge(this, -1, m_maximum,
                               wxDefaultPosition, wxDefaultSize,
@@ -266,12 +266,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         SetTimeLabel(0, m_elapsed);
     }
 
-#ifdef __WXMAC__
     Update();
-#else
-    // Update the display (especially on X, GTK)
-    wxYield();
-#endif
 }
 
 wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
@@ -331,11 +326,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
     {
         m_msg->SetLabel(newmsg);
 
-#ifdef __WXMAC__
         wxYieldIfNeeded() ;
-#else
-        wxYield();
-#endif
     }
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
@@ -374,11 +365,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
                 m_msg->SetLabel(_("Done."));
             }
 
-#ifdef __WXMAC__
             wxYieldIfNeeded() ;
-#else
-            wxYield();
-#endif
 
             (void)ShowModal();
         }
@@ -394,17 +381,13 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
     }
     else
     {
-        // update the display
-#ifdef __WXMAC__
+        // we have to yield because not only we want to update the display but
+        // also to process the clicks on the cancel button
         wxYieldIfNeeded() ;
-#else
-        wxYield();
-#endif
     }
 
-#ifdef __WXMAC__
+    // update the display in case yielding above didn't do it
     Update();
-#endif
 
     return m_state != Canceled;
 }