X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=1fd96ea0b2800e012478e478f3f0618c29d76d92;hb=3a56fa86d04c631143a45bdb34cb0e570e4ca9fb;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..1fd96ea0b 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 _("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) {