implemented (more) correct <pre> handling

[wxWidgets.git] / include / wx / generic / progdlgg.h

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 0b806f6b0dcba1f63d893f935caa65db74639a64..3c6de052883849c1a9e8a912dcac7dab6636e831 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -23,6 +23,7 @@
 #include "wx/dialog.h"
 
 class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxGauge;
 class WXDLLEXPORT wxStaticText;
 
 /* Progress dialog which shows a moving progress bar.
@@ -54,7 +55,7 @@ public:
        @param newmsg if used, new message to display
        @returns true if ABORT button has not been pressed
    */
-   bool Update(int value = -1, const wxString& newmsg = T(""));
+   bool Update(int value = -1, const wxString& newmsg = wxT(""));
 
    /* Can be called to continue after the cancel button has been pressed, but
        the program decided to continue the operation (e.g., user didn't
@@ -62,12 +63,20 @@ public:
    */
    void Resume() { m_state = Continue; }
 
-   // implementation from now on
-       // callback for optional abort button
+protected:
+   // callback for optional abort button
    void OnCancel(wxCommandEvent& event);
-       // callback to disable "hard" window closing
+
+   // callback to disable "hard" window closing
    void OnClose(wxCloseEvent& event);
 
+   // callback to detect when the dialog is closed
+   void OnShow(wxShowEvent& event);
+
+   // must be called to reenable the other windows temporarily disabled while
+   // the dialog was shown
+   void ReenableOtherWindows();
+
 private:
    // create the label with given text and another one to show the time nearby
    // under the lastWindow and modify it to be the same as the control created
@@ -75,21 +84,19 @@ private:
    wxStaticText *CreateLabel(const wxString& text, wxWindow **lastWindow);
 
    // the status bar
-   class wxGauge *m_gauge;
+   wxGauge *m_gauge;
    // the message displayed
-   class wxStaticText *m_msg;
-   // disable all or parent window only
-   bool m_disableParentOnly;
-   // auto-hide?
-   bool m_AutoHide;
+   wxStaticText *m_msg;
    // displayed elapsed, estimated, remaining time
    class wxStaticText *m_elapsed,
                       *m_estimated,
                       *m_remaining;
    // time when the dialog was created
    unsigned long m_timeStart;
-   // parent window
-   wxWindow *m_parent;
+
+   // parent top level window (may be NULL)
+   wxWindow *m_parentTop;
+
    // continue processing or not (return value for Update())
    enum
    {
@@ -98,11 +105,16 @@ private:
       Continue,            // can be cancelled but wasn't
       Finished             // finished, waiting to be removed from screen
    } m_state;
+
    // the abort button (or NULL if none)
    wxButton *m_btnAbort;
+
    // the maximum value
    int m_maximum;
 
+   // for wxPD_APP_MODAL case
+   class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
+
    DECLARE_EVENT_TABLE()
 };
 #endif