Try wxFRAME_FLOAT_ON_PARENT instead of wxSTAY_ON_TOP (#909).

diff --git a/ChangeLog b/ChangeLog
index 42d7e92dbddb81e30e8e7a5bd1c9a766e87d65fd..0d63da2434baa37875ef0242a5aa76ca4285ad26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-05  c.hetherington  <cth@carlh.net>
+
+       * Fix stay-on-top behaviour of audio/video graphs
+       to only stay on top of other DCP-o-matic windows (#909).
+
 2016-07-04  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.8.18 released.

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 19b5fe759ead7081645b551ec389699b9bf1f7ef..b7f1f613b0723252158d61ea5d8db367a6c589d6 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -47,7 +47,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
                _("Audio"),
                wxDefaultPosition,
                wxSize (640, 512),
-               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
                )
        , _film (film)
        , _content (content)

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index ae4b8f8203dcdd8c9bf5da983988c7bfd0c8aea5..e4b09b8eec0b2f9ecb24ddf012fbf3e0d143f81b 100644 (file)
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -35,7 +35,7 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
                _("Video Waveform"),
                wxDefaultPosition,
                wxSize (640, 512),
-               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
                )
        , _viewer (viewer)
 {