in debug mode when clicking with the middle mouse button draw borders around all...

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 5b9cee440a6ed03a77b4680a837e1a94fe0dcef2..aa0de142727c7f34c761711b6aef1956bf1b3974 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxStaticText;
 /* Progress dialog which shows a moving progress bar.
     Taken from the Mahogany project.*/
 
 /* Progress dialog which shows a moving progress bar.
     Taken from the Mahogany project.*/
 

-class WXDLLEXPORT wxProgressDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxProgressDialog : public wxDialog

 {
 DECLARE_DYNAMIC_CLASS(wxProgressDialog)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxProgressDialog)
 public:


@@ -50,7 +50,7 @@ public:
     /* Update the status bar to the new value.
        @param value new value
        @param newmsg if used, new message to display
     /* Update the status bar to the new value.
        @param value new value
        @param newmsg if used, new message to display

-       @returns true if ABORT button has not been pressed
+       @return true if ABORT button has not been pressed

     */
     virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
 
     */
     virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
 


@@ -61,13 +61,17 @@ public:
     // 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(); }
 

+    virtual bool Show( bool show = true );
+

     /* 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();
 
     /* 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();
 

-    virtual bool Show( bool show = true );
+    int GetValue() const;
+    int GetRange() const;
+    wxString GetMessage() const;

 
 protected:
     // callback for optional abort button
 
 protected:
     // callback for optional abort button


@@ -101,7 +105,7 @@ private:
     void DisableSkip() { EnableSkip(false); }
     void DisableAbort() { EnableAbort(false); }
 
     void DisableSkip() { EnableSkip(false); }
     void DisableAbort() { EnableAbort(false); }
 

-    // the status bar
+    // the widget displaying current status (may be NULL)

     wxGauge *m_gauge;
     // the message displayed
     wxStaticText *m_msg;
     wxGauge *m_gauge;
     // the message displayed
     wxStaticText *m_msg;