wxMSW update for CW, wxMac updated

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index fffb684cc3f8f5cb69454b5e346d69673115ac9c..46f42696d98a7d58f1abe2e1641cf3365eef3346 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -150,21 +150,21 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         nTimeLabels++;
 
     {
         nTimeLabels++;
 

-        m_elapsed = CreateLabel(T("Elapsed time : "), &lastWindow);
+        m_elapsed = CreateLabel(wxT("Elapsed time : "), &lastWindow);

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

-        m_estimated = CreateLabel(T("Estimated time : "), &lastWindow);
+        m_estimated = CreateLabel(wxT("Estimated time : "), &lastWindow);

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

-        m_remaining = CreateLabel(T("Remaining time : "), &lastWindow);
+        m_remaining = CreateLabel(wxT("Remaining time : "), &lastWindow);

     }
 
     if ( nTimeLabels > 0 )
     }
 
     if ( nTimeLabels > 0 )


@@ -227,6 +227,9 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     // Update the display (especially on X, GTK)
     wxYield();
 
     // Update the display (especially on X, GTK)
     wxYield();

+    #ifdef __WXMAC__
+    MacUpdateImmediately() ;
+    #endif

 }
 
 wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 }
 
 wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,


@@ -234,7 +237,7 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 {
     wxLayoutConstraints *c;
 
 {
     wxLayoutConstraints *c;
 

-    wxStaticText *label = new wxStaticText(this, -1, T("unknown"));
+    wxStaticText *label = new wxStaticText(this, -1, wxT("unknown"));

     c = new wxLayoutConstraints;
 
     // VZ: I like the labels be centered - if the others don't mind, you may
     c = new wxLayoutConstraints;
 
     // VZ: I like the labels be centered - if the others don't mind, you may


@@ -265,8 +268,8 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 bool
 wxProgressDialog::Update(int value, const wxString& newmsg)
 {
 bool
 wxProgressDialog::Update(int value, const wxString& newmsg)
 {

-   wxASSERT_MSG( value == -1 || m_gauge, T("cannot update non existent dialog") );
-   wxASSERT_MSG( value <= m_maximum, T("invalid progress value") );
+   wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
+   wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );

 
 
    if( m_gauge )
 
 
    if( m_gauge )


@@ -313,6 +316,9 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
        // update the display
        wxYield();
    }
        // update the display
        wxYield();
    }

+    #ifdef __WXMAC__
+    MacUpdateImmediately() ;
+    #endif

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


@@ -374,7 +380,7 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label)
         unsigned long hours = val / 3600;
         unsigned long minutes = (val % 3600) / 60;
         unsigned long seconds = val % 60;
         unsigned long hours = val / 3600;
         unsigned long minutes = (val % 3600) / 60;
         unsigned long seconds = val % 60;

-        s.Printf(T("%lu:%02lu:%02lu"), hours, minutes, seconds);
+        s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds);

 
         if ( s != label->GetLabel() )
             label->SetLabel(s);
 
         if ( s != label->GetLabel() )
             label->SetLabel(s);