Merge master.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 6343d78af..3d1ad30c0 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -33,13 +33,18 @@ class Job;
 class JobManagerView : public wxScrolledWindow
 {
 public:
-	JobManagerView (wxWindow *);
+	enum Buttons {
+		PAUSE = 0x1,
+	};
+		
+	JobManagerView (wxWindow *, Buttons);
 
 	void update ();
 
 private:
 	void periodic (wxTimerEvent &);
 	void cancel_clicked (wxCommandEvent &);
+	void pause_clicked (wxCommandEvent &);
 	void details_clicked (wxCommandEvent &);
 
 	boost::shared_ptr<wxTimer> _timer;
@@ -49,10 +54,12 @@ private:
 		wxGauge* gauge;
 		wxStaticText* message;
 		wxButton* cancel;
+		wxButton* pause;
 		wxButton* details;
 		bool finalised;
 		bool scroll_nudged;
 	};
 		
 	std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
+	Buttons _buttons;
 };