Merge master.

[dcpomatic.git] / src / wx / properties_dialog.h

diff --git a/src/wx/properties_dialog.h b/src/wx/properties_dialog.h
index 308c0f7b3f5bdced158de82e7362bbdae7711006..aeb8927b254458db68138dd4bbabe13d22e5e7b2 100644 (file)
--- a/src/wx/properties_dialog.h
+++ b/src/wx/properties_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,11 +18,12 @@
 */
 
 #include <wx/wx.h>
+#include "table_dialog.h"
 
 class Film;
 class ThreadedStaticText;
 
-class PropertiesDialog : public wxDialog
+class PropertiesDialog : public TableDialog
 {
 public:
        PropertiesDialog (wxWindow *, boost::shared_ptr<Film>);
@@ -32,8 +33,7 @@ private:
 
        boost::shared_ptr<Film> _film;
        wxStaticText* _frames;
-       wxStaticText* _disk_for_frames;
-       wxStaticText* _total_disk;
+       wxStaticText* _disk;
        ThreadedStaticText* _encoded;
 };