interface additions (mostly for new generic/toolwin)

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 34890e763ce17c70c987bc942ca7a9976f70470a..90436f9340ec64dfc248832fe9ac37522f30f0b8 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -86,26 +86,24 @@ 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;
     m_state = hasAbortButton ? Continue : Uncancelable;
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
     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,7 +122,11 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         m_gauge = new wxGauge(this, -1, maximum,
                 wxDefaultPosition, wxDefaultSize,
     {
         m_gauge = new wxGauge(this, -1, maximum,
                 wxDefaultPosition, wxDefaultSize,

-                wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH));
+                wxGA_HORIZONTAL | wxRAISED_BORDER);
+// Sorry, but wxGA_SMOOTH happens to also mean wxDIALOG_MODAL and will
+// cause the dialog to be modal. Have an extra style argument to wxProgressDialog,
+// perhaps.
+//                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);
         c = new wxLayoutConstraints;
         c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
         c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);


@@ -209,14 +211,15 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     Centre(wxCENTER_FRAME | wxBOTH);
 
 
     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);
     }
 
     Show(TRUE);


@@ -266,60 +269,69 @@ 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, 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() )
-      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();
-   }
+    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"));
+        }
+
+        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
 
 
 #ifdef __WXMAC__
     MacUpdateImmediately();
 #endif
 

-   return m_state != Canceled;
+    return m_state != Canceled;

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


@@ -349,9 +361,20 @@ void wxProgressDialog::OnCancel(wxCommandEvent& event)
 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;

+    }

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


@@ -360,14 +383,14 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
 
 wxProgressDialog::~wxProgressDialog()
 {
 
 wxProgressDialog::~wxProgressDialog()
 {

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

     {
     {

-        if ( m_parent )
-            m_parent->Enable(TRUE);
+        delete m_winDisabler;

     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }