avoid conflict between wxBookCtrlBase::DoSetSelection() and the derived classes;...

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 81fda8c37ebefc12d956951e8bfaf1cf22a2c587..44467b1836a60eb2a338102c770c6f5ee0bd1202 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -13,6 +13,7 @@
 #define __PROGDLGH_G__
 
 #include "wx/defs.h"
 #define __PROGDLGH_G__
 
 #include "wx/defs.h"

+#include "wx/progdlg.h"

 
 #if wxUSE_PROGRESSDLG
 
 
 #if wxUSE_PROGRESSDLG
 


@@ -52,6 +53,11 @@ public:
        @returns true if ABORT button has not been pressed
    */
    virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
        @returns true if ABORT button has not been pressed
    */
    virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);

+
+    /* Switches the dialog to use a gauge in indeterminate mode and calls
+       wxGauge::Pulse() to show to the user a bit of progress */
+    virtual bool UpdatePulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL);
+

     // Must provide overload to avoid hiding it (and warnings about it)
     virtual void Update() { wxDialog::Update(); }
 
     // Must provide overload to avoid hiding it (and warnings about it)
     virtual void Update() { wxDialog::Update(); }
 


@@ -82,6 +88,9 @@ private:
    // as the next windows in the sizer, returns the created control
    wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer);
 
    // as the next windows in the sizer, returns the created control
    wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer);
 

+    // updates the label message
+   void UpdateMessage(const wxString &newmsg);
+

    // shortcuts for enabling buttons
    void EnableClose();
    void EnableSkip(bool enable=true);
    // shortcuts for enabling buttons
    void EnableClose();
    void EnableSkip(bool enable=true);