SurfaceInspector uses SelectionSystem's signal now

instead of implementing its Observer interface

radiant/ui/surfaceinspector/SurfaceInspector.cpp

@@ -630,12 +630,6 @@ void SurfaceInspector::postRedo()
 	doUpdate();
 }
 
-// Gets notified upon selection change
-void SurfaceInspector::selectionChanged(const scene::INodePtr& node, bool isComponent)
-{
-	doUpdate();
-}
-
 void SurfaceInspector::fitTexture()
 {
 	double repeatX = _fitTexture.width->GetValue();
@@ -703,8 +697,16 @@ void SurfaceInspector::_preShow()
 {
 	TransientWindow::_preShow();
 
+	// Disconnect everything, in some cases we get two consecutive Show() calls in wxGTK
+	_selectionChanged.disconnect();
+	_brushFaceShaderChanged.disconnect();
+	_faceTexDefChanged.disconnect();
+	_patchTextureChanged.disconnect();
+
 	// Register self to the SelSystem to get notified upon selection changes.
-	GlobalSelectionSystem().addObserver(this);
+	_selectionChanged = GlobalSelectionSystem().signal_selectionChanged().connect(
+		[this] (const ISelectable&) { doUpdate(); });
+
 	GlobalUndoSystem().addObserver(this);
 
 	// Get notified about face shader changes
@@ -732,12 +734,12 @@ void SurfaceInspector::_preHide()
 {
 	TransientWindow::_preHide();
 
+	_selectionChanged.disconnect();
 	_patchTextureChanged.disconnect();
 	_faceTexDefChanged.disconnect();
 	_brushFaceShaderChanged.disconnect();
 
 	GlobalUndoSystem().removeObserver(this);
-	GlobalSelectionSystem().removeObserver(this);
 }
 
 } // namespace ui

radiant/ui/surfaceinspector/SurfaceInspector.h

@@ -2,7 +2,6 @@
 
 #include <map>
 #include "icommandsystem.h"
-#include "iselection.h"
 #include "iregistry.h"
 #include "iundo.h"
 #include "iradiant.h"
@@ -32,7 +31,6 @@ typedef std::shared_ptr<SurfaceInspector> SurfaceInspectorPtr;
 /// Inspector for properties of a surface and its applied texture
 class SurfaceInspector : 
 	public wxutil::TransientWindow,
-	public SelectionSystem::Observer,
 	public UndoSystem::Observer
 {
 	struct ManipulatorRow
@@ -94,6 +92,7 @@ class SurfaceInspector :
 	sigc::connection _brushFaceShaderChanged;
 	sigc::connection _faceTexDefChanged;
 	sigc::connection _patchTextureChanged;
+	sigc::connection _selectionChanged;
 
 public:
 
@@ -110,12 +109,6 @@ class SurfaceInspector :
 	 */
 	void keyChanged();
 
-	/** greebo: SelectionSystem::Observer implementation. Gets called by
-	 * the SelectionSystem upon selection change to allow updating of the
-	 * texture properties.
-	 */
-	void selectionChanged(const scene::INodePtr& node, bool isComponent);
-
 	// Command target to toggle the dialog
 	static void toggle(const cmd::ArgumentList& args);