ping method almost there

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 0f9d5d899f96de27d27567e9eb1dde2956184647..2a7eb0791869f5fa8bb4f88eb78941f9e1371421 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -41,7 +41,7 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"

-#   include "wx/timer.h"
+    #include "wx/timer.h"

 #endif
 
 #include "wx/generic/progdlgg.h"
 #endif
 
 #include "wx/generic/progdlgg.h"


@@ -86,11 +86,12 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
                                    int maximum,
                                    wxWindow *parent,
                                    int style)
                                    int maximum,
                                    wxWindow *parent,
                                    int style)

-                : wxDialog(m_parent, -1, title)
+                : wxDialog(parent, -1, title)

 {
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
     m_state = hasAbortButton ? Continue : Uncancelable;
     m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
 {
     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_parent = parent;
     m_maximum = maximum;
 


@@ -99,7 +100,14 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     wxClientDC dc(this);
     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
     long widthText;
     wxClientDC dc(this);
     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
     long widthText;

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


@@ -135,7 +143,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         m_gauge = (wxGauge *)NULL;
 
     // create the estimated/remaining/total time zones if requested
         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 )
 
     int nTimeLabels = 0;
     if ( style & wxPD_ELAPSED_TIME )


@@ -216,6 +224,9 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     Show(TRUE);
     Enable(TRUE); // enable this window
 
     Show(TRUE);
     Enable(TRUE); // enable this window

+
+    // Update the display (especially on X, GTK)
+    wxYield();

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


@@ -275,7 +286,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
       SetTimeLabel(remaining, m_remaining);
    }
 
       SetTimeLabel(remaining, m_remaining);
    }
 

-   if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & wxPD_AUTO_HIDE) )
+   if ( (value == m_maximum ) && !m_AutoHide )

    {
        if ( m_btnAbort )
        {
    {
        if ( m_btnAbort )
        {