diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index bf19df9d9..3cada6f10 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -82,7 +82,7 @@ const int sliderFontSize = 12; // TipPanel // -class TipPanel final : public wxPopupWindow +class TipPanel final : public wxFrame { public: TipPanel(wxWindow *parent, const wxString & label); @@ -115,7 +115,8 @@ BEGIN_EVENT_TABLE(TipPanel, wxPopupWindow) END_EVENT_TABLE() TipPanel::TipPanel(wxWindow *parent, const wxString & maxLabel) -: wxPopupWindow(parent, wxFRAME_SHAPED) +: wxFrame(parent, wxID_ANY, wxString{}, wxDefaultPosition, wxDefaultSize, + wxFRAME_SHAPED | wxFRAME_FLOAT_ON_PARENT) { SetBackgroundStyle(wxBG_STYLE_PAINT); @@ -940,7 +941,7 @@ void LWSlider::ShowTip(bool show) CreatePopWin(); FormatPopWin(); SetPopWinPosition(); - mTipPanel->Show(); + mTipPanel->ShowWithoutActivating(); } else { diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index a1158640a..9bd20af11 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -229,7 +229,6 @@ class LWSlider TipPanel *mTipPanel; wxString mTipTemplate; - wxTimer mTimer; Ruler* mpRuler;