From e2d34e982ea502eb74b1288009894dfd3c4c8088 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 5 Jan 2022 22:47:32 +0100 Subject: [PATCH] Skip all wxDPIChangedEvent So base classes will process the event too. This is need for (at least) wxGenericColourButton It has its own handler, but also needs to handle the DPI event in wxButtonImageData. --- src/aui/auibar.cpp | 4 +++- src/generic/clrpickerg.cpp | 4 +++- src/generic/colrdlgg.cpp | 4 +++- src/generic/datavgen.cpp | 2 ++ src/generic/odcombo.cpp | 4 +++- src/generic/srchctlg.cpp | 4 +++- src/msw/listctrl.cpp | 2 ++ src/msw/slider.cpp | 2 ++ src/msw/toolbar.cpp | 2 ++ src/propgrid/propgrid.cpp | 4 +++- src/stc/PlatWX.cpp | 4 +++- src/stc/stc.cpp | 2 ++ src/stc/stc.cpp.in | 2 ++ 13 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index 3705d8b776..ee092c16ab 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -2384,9 +2384,11 @@ void wxAuiToolBar::OnIdle(wxIdleEvent& evt) evt.Skip(); } -void wxAuiToolBar::OnDPIChanged(wxDPIChangedEvent& WXUNUSED(event)) +void wxAuiToolBar::OnDPIChanged(wxDPIChangedEvent& event) { Realize(); + + event.Skip(); } void wxAuiToolBar::UpdateWindowUI(long flags) diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp index a3b9f938e5..1f62aa49ac 100644 --- a/src/generic/clrpickerg.cpp +++ b/src/generic/clrpickerg.cpp @@ -120,10 +120,12 @@ void wxGenericColourButton::OnColourChanged(wxColourDialogEvent& ev) parent->ProcessWindowEvent(event); } -void wxGenericColourButton::OnDPIChanged(wxDPIChangedEvent&WXUNUSED(event)) +void wxGenericColourButton::OnDPIChanged(wxDPIChangedEvent& event) { m_bitmap = wxBitmap(FromDIP(defaultBitmapSize)); UpdateColour(); + + event.Skip(); } void wxGenericColourButton::UpdateColour() diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index eab29f0654..dba671b750 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -278,13 +278,15 @@ void wxGenericColourDialog::OnPaint(wxPaintEvent& WXUNUSED(event)) PaintHighlight(dc, true); } -void wxGenericColourDialog::OnDPIChanged(wxDPIChangedEvent& WXUNUSED(event)) +void wxGenericColourDialog::OnDPIChanged(wxDPIChangedEvent& event) { CalculateMeasurements(); #if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA CreateCustomBitmaps(); #endif + + event.Skip(); } void wxGenericColourDialog::CalculateMeasurements() diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 8b7f2ca489..116db692c4 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -5682,6 +5682,8 @@ void wxDataViewCtrl::OnDPIChanged(wxDPIChangedEvent& event) width = event.ScaleX(width); m_cols[i]->SetWidth(width); } + + event.Skip(); } void wxDataViewCtrl::SetFocus() diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index c93272a11d..4651b7ebf8 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -108,9 +108,11 @@ void wxVListBoxComboPopup::SetFocus() #endif } -void wxVListBoxComboPopup::OnDPIChanged(wxDPIChangedEvent& WXUNUSED(event)) +void wxVListBoxComboPopup::OnDPIChanged(wxDPIChangedEvent& event) { m_itemHeight = m_combo->GetCharHeight(); + + event.Skip(); } bool wxVListBoxComboPopup::LazyCreate() diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index 4aec60d510..0f6d3a14d9 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -1200,9 +1200,11 @@ void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) ) LayoutControls(); } -void wxSearchCtrl::OnDPIChanged(wxDPIChangedEvent &WXUNUSED(event)) +void wxSearchCtrl::OnDPIChanged(wxDPIChangedEvent &event) { RecalcBitmaps(); + + event.Skip(); } #if wxUSE_MENUS diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index e7b14e03d5..7c8369e5ed 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -467,6 +467,8 @@ void wxListCtrl::OnDPIChanged(wxDPIChangedEvent &event) SetColumnWidth(i, event.ScaleX(width)); } + + event.Skip(); } bool wxListCtrl::IsDoubleBuffered() const diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index 6334a23fde..7597708098 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -654,6 +654,8 @@ void wxSlider::OnDPIChanged(wxDPIChangedEvent& event) int thumbLen = GetThumbLength(); SetThumbLength(event.ScaleX(thumbLen)); + + event.Skip(); } // ---------------------------------------------------------------------------- diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index 081a864d67..64d137c834 100644 --- a/src/msw/toolbar.cpp +++ b/src/msw/toolbar.cpp @@ -1992,6 +1992,8 @@ void wxToolBar::OnDPIChanged(wxDPIChangedEvent& event) // there are still minor but visible cosmetic problems when moving the // toolbar from 125% to 175% display. CallAfter(&wxToolBar::RealizeHelper); + + event.Skip(); } bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam)) diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index c406f269a9..32567e23e9 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -1360,11 +1360,13 @@ void wxPropertyGrid::OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event } } -void wxPropertyGrid::OnDPIChanged(wxDPIChangedEvent &WXUNUSED(event)) +void wxPropertyGrid::OnDPIChanged(wxDPIChangedEvent &event) { m_vspacing = FromDIP(wxPG_DEFAULT_VSPACING); CalculateFontAndBitmapStuff(m_vspacing); Refresh(); + + event.Skip(); } // ----------------------------------------------------------------------- diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 985370b690..88bff830e1 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -2940,7 +2940,7 @@ void wxSTCListBox::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) GetParent()->Refresh(); } -void wxSTCListBox::OnDPIChanged(wxDPIChangedEvent& WXUNUSED(event)) +void wxSTCListBox::OnDPIChanged(wxDPIChangedEvent& event) { m_imagePadding = FromDIP(1); m_textBoxToTextGap = FromDIP(3); @@ -2950,6 +2950,8 @@ void wxSTCListBox::OnDPIChanged(wxDPIChangedEvent& WXUNUSED(event)) GetTextExtent(EXTENT_TEST, &w, &m_textHeight); RecalculateItemHeight(); + + event.Skip(); } void wxSTCListBox::OnMouseLeaveWindow(wxMouseEvent& event) diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index 41cb0edbad..d7eeeb70cf 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -5450,6 +5450,8 @@ void wxStyledTextCtrl::OnDPIChanged(wxDPIChangedEvent& evt) { { AutoCompCancel(); } + + evt.Skip(); } diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index 6a59e1fae9..6eb183b181 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -977,6 +977,8 @@ void wxStyledTextCtrl::OnDPIChanged(wxDPIChangedEvent& evt) { { AutoCompCancel(); } + + evt.Skip(); }