X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be9abe3fd0edec7215fa00aa158f7581da4df2fe..2df7be7f2cca699a02ee0c9ce69de9bfe6b0922f:/include/wx/generic/progdlgg.h?ds=sidebyside

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index b8f0a09f59..8d8c7e544b 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -17,9 +17,10 @@
 #endif
 
 #include "wx/setup.h"
-#include "wx/frame.h"
 
+#if wxUSE_PROGRESSDLG
 
+#include "wx/frame.h"
 
 /** Progress dialog which shows a moving progress bar.
     Taken from the Mahogany project.*/
@@ -50,7 +51,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 = "");
+   bool Update(int value = -1, const wxString& newmsg = _T(""));
 
    /** 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
@@ -59,7 +60,7 @@ public:
    void Resume() { m_state = Continue; }
 
    /// Callback for optional abort button
-   void OnCancel(wxEvent& WXUNUSED(event)) { m_state = Canceled; }
+   void OnCancel(wxCommandEvent& WXUNUSED(event)) { m_state = Canceled; }
 
    /// callback to disable "hard" window closing
    void OnClose(wxCloseEvent& event);
@@ -82,11 +83,13 @@ private:
       Finished             // finished, waiting to be removed from screen
    } m_state;
    /// the abort button (or NULL if none)
-   wxButton *m_btnAbort;
+   class wxButton *m_btnAbort;
    /// the maximum value
    int m_maximum;
 
    DECLARE_EVENT_TABLE()
 };
+#endif
+
 #endif
     // __PROGDLGH_G__