X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_widget.h;h=6f406dadbc926e92c094b74d53366327b6d08093;hb=e8fc5f57348dd41ac4996f296c98bb7855435c12;hp=bbe16039998e9d22db60594cd5b3534d856538ef;hpb=cf8bbea2de38c4e9ac140f55b27311b7b6dcd814;p=dcpomatic.git

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index bbe160399..6f406dadb 100644
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -41,7 +41,7 @@
  *  @param V Data type of state as used by the view.
  */
 template <class S, class T, typename U, typename V>
-class ContentWidget
+class ContentWidget : public boost::noncopyable
 {
 public:
 	/** @param parent Parent window.
@@ -103,11 +103,12 @@ public:
 	}
 
 	/** Add this widget to a wxGridBagSizer */
-	void add (wxGridBagSizer* sizer, wxGBPosition position)
+	void add (wxGridBagSizer* sizer, wxGBPosition position, wxGBSpan span = wxDefaultSpan)
 	{
 		_sizer = sizer;
 		_position = position;
-		_sizer->Add (_wrapped, _position);
+		_span = span;
+		_sizer->Add (_wrapped, _position, _span);
 	}
 
 	/** Update the view from the model */
@@ -151,7 +152,7 @@ private:
 
 		_sizer->Detach (_button);
 		_button->Hide ();
-		_sizer->Add (_wrapped, _position);
+		_sizer->Add (_wrapped, _position, _span);
 		_wrapped->Show ();
 		_sizer->Layout ();
 	}
@@ -165,7 +166,7 @@ private:
 		_wrapped->Hide ();
 		_sizer->Detach (_wrapped);
 		_button->Show ();
-		_sizer->Add (_button, _position);
+		_sizer->Add (_button, _position, _span);
 		_sizer->Layout ();
 	}
 
@@ -187,6 +188,7 @@ private:
 	T* _wrapped;
 	wxGridBagSizer* _sizer;
 	wxGBPosition _position;
+	wxGBSpan _span;
 	wxButton* _button;
 	List _content;
 	int _property;