Applied patch from Bo, WIP

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 44467b1836a60eb2a338102c770c6f5ee0bd1202..85cbeedabd1e3e3ce57505a0eeb5cac8714afcc5 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -19,9 +19,9 @@
 
 #include "wx/dialog.h"
 
-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxGauge;
-class WXDLLEXPORT wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxGauge;
+class WXDLLIMPEXP_FWD_CORE wxStaticText;
 
 /* Progress dialog which shows a moving progress bar.
     Taken from the Mahogany project.*/
@@ -56,7 +56,7 @@ public:
 
     /* 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);
+    virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL);
 
     // Must provide overload to avoid hiding it (and warnings about it)
     virtual void Update() { wxDialog::Update(); }
@@ -91,6 +91,9 @@ private:
     // updates the label message
    void UpdateMessage(const wxString &newmsg);
 
+   // common part of Update() and Pulse(), returns true if not cancelled
+   bool DoAfterUpdate(bool *skip);
+
    // shortcuts for enabling buttons
    void EnableClose();
    void EnableSkip(bool enable=true);
@@ -158,7 +161,7 @@ private:
 #endif // __WXMSW__
 
     // for wxPD_APP_MODAL case
-    class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
+    class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler;
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxProgressDialog)