Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index e21460c41a072031df57659d70394a07072d5e54..473e9db4872608d87215f0e1dffdf9898d80a63e 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -64,14 +64,12 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
 // event tables
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
        EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
        EVT_CLOSE(wxProgressDialog::OnClose)
     END_EVENT_TABLE()
 
     IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
-#endif
 
 // ============================================================================
 // implementation
@@ -104,9 +102,9 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 // have two versions of this in wxWindowDC tp avoid function hiding
 // since there are two of these in wxDCBase, and in turn in wxDC.
 // VA cannot resolve this so:
-    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL, FALSE);
+    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
 #else
-    dc.GetTextExtent(message, &widthText, NULL);
+    dc.GetTextExtent(message, &widthText, (long*)NULL);
 #endif
 
     m_msg = new wxStaticText(this, -1, message);
@@ -126,7 +124,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         m_gauge = new wxGauge(this, -1, maximum,
                 wxDefaultPosition, wxDefaultSize,
-                wxGA_HORIZONTAL | wxRAISED_BORDER);
+                wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH));
         c = new wxLayoutConstraints;
         c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
         c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
@@ -143,35 +141,34 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         m_gauge = (wxGauge *)NULL;
 
     // create the estimated/remaining/total time zones if requested
-    m_elapsed = m_estimated = m_remaining = NULL;
+    m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
 
     int nTimeLabels = 0;
     if ( style & wxPD_ELAPSED_TIME )
     {
         nTimeLabels++;
 
-        m_elapsed = CreateLabel(_T("Elapsed time : "), &lastWindow);
+        m_elapsed = CreateLabel(wxT("Elapsed time : "), &lastWindow);
     }
 
     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++;
 
-        m_remaining = CreateLabel(_T("Remaining time : "), &lastWindow);
+        m_remaining = CreateLabel(wxT("Remaining time : "), &lastWindow);
     }
 
     if ( nTimeLabels > 0 )
     {
         // set it to the current time
         m_timeStart = wxGetCurrentTime();
-
         sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
     }
 
@@ -205,7 +202,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     sizeDlg.y += 2*LAYOUT_Y_MARGIN;
 
     // try to make the dialog not square but rectangular of reasonabel width
-    sizeDlg.x = wxMax(widthText, 4*sizeDlg.y/3);
+    sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3);
     sizeDlg.x *= 3;
     sizeDlg.x /= 2;
     SetClientSize(sizeDlg);
@@ -224,6 +221,12 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     Show(TRUE);
     Enable(TRUE); // enable this window
+
+    // Update the display (especially on X, GTK)
+    wxYield();
+    #ifdef __WXMAC__
+    MacUpdateImmediately() ;
+    #endif
 }
 
 wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
@@ -231,7 +234,7 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 {
     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
@@ -262,8 +265,8 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 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 )
@@ -310,6 +313,9 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
        // update the display
        wxYield();
    }
+    #ifdef __WXMAC__
+    MacUpdateImmediately() ;
+    #endif
 
    return m_state != Canceled;
 }
@@ -371,7 +377,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;
-        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);