Applied patch [ 546335 ] Added Automation types and array access

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 8979d2f0030834aba50212d3bb7929458d3bb9b4..4ea81319df4dbb4e8cd34333626bec95788c6916 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -55,20 +55,25 @@ 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 = wxT(""));
+   bool Update(int value, 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
        confirm it)
    */
-   void Resume() { m_state = Continue; }
+   void Resume();
 
-   // 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);
 
+   // 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
@@ -97,12 +102,26 @@ 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;
 
+#ifdef __WXMSW__
+   // the factor we use to always keep the value in 16 bit range as the native
+   // control only supports ranges from 0 to 65,535
+   size_t m_factor;
+#endif // __WXMSW__
+
+   // for wxPD_APP_MODAL case
+   class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
+
    DECLARE_EVENT_TABLE()
+private:
+    // Virtual function hiding supression
+    virtual void Update() { wxDialog::Update(); }
 };
 #endif