diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:26:50 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:26:50 +0200 |
| commit | 669df123648aaa6aeccc70206b5417bc48b4e9ae (patch) | |
| tree | 463c107a8d6405020bb304f7a7253e6b64afeee0 /ui/progress_indicator.h | |
| parent | 5.18 (diff) | |
| download | FreeFileSync-669df123648aaa6aeccc70206b5417bc48b4e9ae.tar.gz FreeFileSync-669df123648aaa6aeccc70206b5417bc48b4e9ae.tar.bz2 FreeFileSync-669df123648aaa6aeccc70206b5417bc48b4e9ae.zip | |
5.19
Diffstat (limited to 'ui/progress_indicator.h')
| -rw-r--r-- | ui/progress_indicator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/progress_indicator.h b/ui/progress_indicator.h index 0789ca80..e2dbb99c 100644 --- a/ui/progress_indicator.h +++ b/ui/progress_indicator.h @@ -10,7 +10,7 @@ #include <functional> #include <zen/error_log.h> //#include <zen/zstring.h> -#include <wx/toplevel.h> +#include <wx/frame.h> #include "../lib/status_handler.h" //#include "main_dlg.h" @@ -18,7 +18,7 @@ class CompareProgressDialog { public: - CompareProgressDialog(wxTopLevelWindow& parentWindow); //CompareProgressDialog will be owned by parentWindow! + CompareProgressDialog(wxFrame& parentWindow); //CompareProgressDialog will be owned by parentWindow! wxWindow* getAsWindow(); //convenience! don't abuse! @@ -52,7 +52,7 @@ struct SyncProgressDialog //--------------------------------------------------------------------------- - virtual wxWindow* getAsWindow() = 0; //convenience! don't abuse! + virtual wxWindow* getWindowIfVisible() = 0; //may be nullptr; don't abuse, use as parent for modal dialogs only! virtual void initNewPhase() = 0; //call after "StatusHandler::initNewPhase" virtual void notifyProgressChange() = 0; //throw (), required by graph! @@ -71,7 +71,7 @@ protected: SyncProgressDialog* createProgressDialog(zen::AbortCallback& abortCb, const std::function<void()>& notifyWindowTerminate, //note: user closing window cannot be prevented on OS X! (And neither on Windows during system shutdown!) const zen::Statistics& syncStat, - wxTopLevelWindow* parentWindow, //may be nullptr + wxFrame* parentWindow, //may be nullptr bool showProgress, const wxString& jobName, const std::wstring& execWhenFinished, |