X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=c38dbf65d98a0d9b52ba44a64640a4a6b505aca1;hb=8796ee8654dfbf98290bfaaca1388e50ab962b40;hp=412ebf8bb7482a67625ae084a256220ee10fb706;hpb=4aa2c70aa6b240d426f782b215749bee7399d6c4;p=dcpomatic.git

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 412ebf8bb..c38dbf65d 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -36,7 +36,14 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 		_("Video Waveform"),
 		wxDefaultPosition,
 		wxSize (640, 512),
+#ifdef DCPOMATIC_OSX
+		/* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps
+		   the window above all others (and not just our own) it's better than nothing for now.
+		*/
+		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+#else
 		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+#endif
 		)
 	, _viewer (viewer)
 {
@@ -83,7 +90,7 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 	overall_sizer->SetSizeHints (this);
 
 	Bind (wxEVT_SHOW, bind (&VideoWaveformDialog::shown, this, _1));
-	_component->Bind (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoWaveformDialog::component_changed, this));
+	_component->Bind (wxEVT_CHOICE, bind (&VideoWaveformDialog::component_changed, this));
 	_contrast->Bind (wxEVT_SCROLL_THUMBTRACK, bind (&VideoWaveformDialog::contrast_changed, this));
 	_plot->MouseMoved.connect (bind (&VideoWaveformDialog::mouse_moved, this, _1, _2, _3, _4));
 
@@ -99,7 +106,7 @@ VideoWaveformDialog::shown (wxShowEvent& ev)
 {
 	_plot->set_enabled (ev.IsShown ());
 	if (ev.IsShown ()) {
-		_viewer->refresh ();
+		_viewer->slow_refresh ();
 	}
 }