fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 2a7eb0791869f5fa8bb4f88eb78941f9e1371421..4fc3c975424a95d8fc7644fd4327fd23f45656d0 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -64,14 +64,15 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
-       EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
-       EVT_CLOSE(wxProgressDialog::OnClose)
-    END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)

 
 

-    IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
-#endif
+    EVT_SHOW(wxProgressDialog::OnShow)
+
+    EVT_CLOSE(wxProgressDialog::OnClose)
+END_EVENT_TABLE()
+
+IMPLEMENT_CLASS(wxProgressDialog, wxDialog)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -88,26 +89,36 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
                                    int style)
                 : wxDialog(parent, -1, title)
 {
                                    int style)
                 : wxDialog(parent, -1, title)
 {

+    m_windowStyle |= style;
+

     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;

+
+#ifdef __WXMSW__
+    // we have to remove the "Close" button from the title bar then as it is
+    // confusing to have it - it doesn't work anyhow
+    //
+    // FIXME: should probably have a (extended?) window style for this
+    if ( !hasAbortButton )
+    {
+        EnableCloseButton(FALSE);
+    }
+#endif // wxMSW
+

     m_state = hasAbortButton ? Continue : Uncancelable;
     m_state = hasAbortButton ? Continue : Uncancelable;

-    m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
-    m_AutoHide = (style & wxPD_AUTO_HIDE) != 0;
-    m_parent = parent;

     m_maximum = maximum;
 
     m_maximum = maximum;
 

+    m_parentTop = parent;
+    while ( m_parentTop && m_parentTop->GetParent() )
+    {
+        m_parentTop = m_parentTop->GetParent();
+    }
+

     wxLayoutConstraints *c;
 
     wxClientDC dc(this);
     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
     long widthText;
     wxLayoutConstraints *c;
 
     wxClientDC dc(this);
     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
     long widthText;

-#if defined(__VISAGECPP__)
-// 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);
     dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);

-#else
-    dc.GetTextExtent(message, &widthText, (long*)NULL);
-#endif

 
     m_msg = new wxStaticText(this, -1, message);
     c = new wxLayoutConstraints;
 
     m_msg = new wxStaticText(this, -1, message);
     c = new wxLayoutConstraints;


@@ -124,9 +135,13 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     if ( maximum > 0 )
     {
 
     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
+        // style argument to wxProgressDialog, perhaps.

         m_gauge = new wxGauge(this, -1, maximum,
         m_gauge = new wxGauge(this, -1, maximum,

-                wxDefaultPosition, wxDefaultSize,
-                wxGA_HORIZONTAL | wxRAISED_BORDER);
+                              wxDefaultPosition, wxDefaultSize,
+                              wxGA_HORIZONTAL);
+

         c = new wxLayoutConstraints;
         c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
         c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
         c = new wxLayoutConstraints;
         c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
         c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);


@@ -150,28 +165,27 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         nTimeLabels++;
 
     {
         nTimeLabels++;
 

-        m_elapsed = CreateLabel(_T("Elapsed time : "), &lastWindow);
+        m_elapsed = CreateLabel(_("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(_("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(_("Remaining time : "), &lastWindow);

     }
 
     if ( nTimeLabels > 0 )
     {
         // set it to the current time
         m_timeStart = wxGetCurrentTime();
     }
 
     if ( nTimeLabels > 0 )
     {
         // set it to the current time
         m_timeStart = wxGetCurrentTime();

-

         sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
     }
 
         sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
     }
 


@@ -205,28 +219,41 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     sizeDlg.y += 2*LAYOUT_Y_MARGIN;
 
     // try to make the dialog not square but rectangular of reasonabel width
     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);
 
     Centre(wxCENTER_FRAME | wxBOTH);
 
     sizeDlg.x *= 3;
     sizeDlg.x /= 2;
     SetClientSize(sizeDlg);
 
     Centre(wxCENTER_FRAME | wxBOTH);
 

-    if (m_disableParentOnly )
+    if ( style & wxPD_APP_MODAL )

     {
     {

-        if ( m_parent )
-            m_parent->Enable(FALSE);
+        m_winDisabler = new wxWindowDisabler(this);

     }
     else
     {
     }
     else
     {

-        wxEnableTopLevelWindows(FALSE);
+        if ( m_parentTop )
+            m_parentTop->Enable(FALSE);
+        m_winDisabler = NULL;

     }
 
     Show(TRUE);
     Enable(TRUE); // enable this window
 
     }
 
     Show(TRUE);
     Enable(TRUE); // enable this window
 

+    // this one can be initialized even if the others are unknown for now
+    //
+    // NB: do it after calling Layout() to keep the labels correctly aligned
+    if ( m_elapsed )
+    {
+        SetTimeLabel(0, m_elapsed);
+    }
+

     // 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 +261,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, _("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,56 +292,75 @@ 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") );
-
-
-   if( m_gauge )
-      m_gauge->SetValue(value + 1);
-
-   if( !newmsg.IsEmpty() )
-      m_msg->SetLabel(newmsg);
-
-   if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
-   {
-      unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
-      unsigned long estimated = elapsed * m_maximum / value;
-      unsigned long remaining = estimated - elapsed;
-
-      SetTimeLabel(elapsed, m_elapsed);
-      SetTimeLabel(estimated, m_estimated);
-      SetTimeLabel(remaining, m_remaining);
-   }
-
-   if ( (value == m_maximum ) && !m_AutoHide )
-   {
-       if ( m_btnAbort )
-       {
-           // tell the user what he should do...
-           m_btnAbort->SetLabel(_("Close"));
-       }
-
-       if ( !newmsg )
-       {
-           // also provide the finishing message if the application didn't
-           m_msg->SetLabel(_("Done."));
-       }
-
-       // so that we return TRUE below and that out [Cancel] handler knew what
-       // to do
-       m_state = Finished;
-
-       wxYield();
-
-       (void)ShowModal();
-   }
-   else
-   {
-       // update the display
-       wxYield();
-   }
-
-   return m_state != Canceled;
+    wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
+    wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
+
+    if ( m_gauge )
+        m_gauge->SetValue(value + 1);
+
+    if ( !newmsg.IsEmpty() )
+    {
+#ifdef __WXMSW__
+        // this seems to be necessary or garbage is left when the new label is
+        // longer than the old one
+        m_msg->SetLabel(wxEmptyString);
+#endif // MSW
+
+        m_msg->SetLabel(newmsg);
+
+        wxYield();
+    }
+
+    if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
+    {
+        unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
+        unsigned long estimated = elapsed * m_maximum / value;
+        unsigned long remaining = estimated - elapsed;
+
+        SetTimeLabel(elapsed, m_elapsed);
+        SetTimeLabel(estimated, m_estimated);
+        SetTimeLabel(remaining, m_remaining);
+    }
+
+    if ( (value == m_maximum ) && !(GetWindowStyle() & wxPD_AUTO_HIDE) )
+    {
+        if ( m_btnAbort )
+        {
+            // tell the user what he should do...
+            m_btnAbort->SetLabel(_("Close"));
+        }
+#ifdef __WXMSW__
+        else // enable the close button to give the user a way to close the dlg
+        {
+            EnableCloseButton(TRUE);
+        }
+#endif // __WXMSW__
+
+        if ( !newmsg )
+        {
+            // also provide the finishing message if the application didn't
+            m_msg->SetLabel(_("Done."));
+        }
+
+        // so that we return TRUE below and that out [Cancel] handler knew what
+        // to do
+        m_state = Finished;
+
+        wxYield();
+
+        (void)ShowModal();
+    }
+    else
+    {
+        // update the display
+        wxYield();
+    }
+
+#ifdef __WXMAC__
+    MacUpdateImmediately();
+#endif
+
+    return m_state != Canceled;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -334,15 +380,40 @@ void wxProgressDialog::OnCancel(wxCommandEvent& event)
         // request to cancel was received, the next time Update() is called we
         // will handle it
         m_state = Canceled;
         // request to cancel was received, the next time Update() is called we
         // will handle it
         m_state = Canceled;

+
+        // update the button state immediately so that the user knows that the
+        // request has been noticed
+        m_btnAbort->Disable();

     }
 }
 
 void wxProgressDialog::OnClose(wxCloseEvent& event)
 {
     if ( m_state == Uncancelable )
     }
 }
 
 void wxProgressDialog::OnClose(wxCloseEvent& event)
 {
     if ( m_state == Uncancelable )

+    {
+        // can't close this dialog

         event.Veto(TRUE);
         event.Veto(TRUE);

+    }
+    else if ( m_state == Finished )
+    {
+        // let the default handler close the window as we already terminated
+        event.Skip();
+    }

     else
     else

+    {
+        // next Update() will notice it

         m_state = Canceled;
         m_state = Canceled;

+    }
+}
+
+void wxProgressDialog::OnShow(wxShowEvent& event)
+{
+    // if the dialog is being hidden, it was closed, so reenable other windows
+    // now
+    if ( event.GetShow() )
+    {
+        ReenableOtherWindows();
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -351,14 +422,21 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
 
 wxProgressDialog::~wxProgressDialog()
 {
 
 wxProgressDialog::~wxProgressDialog()
 {

-    if ( m_disableParentOnly )
+    // normally this should have been already done, but just in case
+    ReenableOtherWindows();
+}
+
+void wxProgressDialog::ReenableOtherWindows()
+{
+    if ( GetWindowStyle() & wxPD_APP_MODAL )

     {
     {

-        if ( m_parent )
-            m_parent->Enable(TRUE);
+        delete m_winDisabler;
+        m_winDisabler = (wxWindowDisabler *)NULL;

     }
     else
     {
     }
     else
     {

-        wxEnableTopLevelWindows(TRUE);
+        if ( m_parentTop )
+            m_parentTop->Enable(TRUE);

     }
 }
 
     }
 }
 


@@ -374,7 +452,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);