From 5dffb76d0a4e15bcede71748e3edee478bf61d73 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 8 Dec 2023 03:08:49 +0100 Subject: [PATCH] Remove bool parameter from MacSetClipChildren() This parameter was always "true" in the existing calls to this function and the underlying UseClippingView() didn't support passing "false" to it anyhow, so it seems simpler and more clear to just remove the parameter. It also avoids clang warnings about it being unused. No real changes. --- include/wx/osx/cocoa/private.h | 2 +- include/wx/osx/core/private.h | 2 +- include/wx/osx/window.h | 2 +- include/wx/scrolwin.h | 2 +- src/generic/datavgen.cpp | 2 +- src/generic/laywin.cpp | 2 +- src/generic/scrlwing.cpp | 2 +- src/generic/vscroll.cpp | 2 +- src/osx/cocoa/window.mm | 2 +- src/osx/window_osx.cpp | 10 +++++----- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index add141eb0e..22b9b0d52a 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -221,7 +221,7 @@ public : virtual void controlTextDidChange(); virtual void AdjustClippingView(wxScrollBar* horizontal, wxScrollBar* vertical) override; - virtual void UseClippingView(bool clip) override; + virtual void UseClippingView() override; virtual WXWidget GetContainer() const override { return m_osxClipView ? m_osxClipView : m_osxView; } protected: diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 6c16eaf783..f4c478497a 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -368,7 +368,7 @@ public : // scrolling views need a clip subview that acts as parent for native children // (except for the scollbars) which are children of the view itself virtual void AdjustClippingView(wxScrollBar* horizontal, wxScrollBar* vertical); - virtual void UseClippingView(bool clip); + virtual void UseClippingView(); // returns native view which acts as a parent for native children virtual WXWidget GetContainer() const; diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index e19241d430..a5f5e2c359 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -224,7 +224,7 @@ public: // returns true if children have to clipped to the content area // (e.g., scrolled windows) bool MacClipChildren() const { return m_clipChildren ; } - void MacSetClipChildren( bool clip ); + void MacSetClipChildren(); // returns true if the grandchildren need to be clipped to the children's content area // (e.g., splitter windows) diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index c612997aab..abedfb8e44 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -439,7 +439,7 @@ public: m_targetWindow = this; #ifdef __WXMAC__ - this->MacSetClipChildren(true); + this->MacSetClipChildren(); #endif // by default, we're scrollable in both directions (but if one of the diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 437c9943fb..f5e111e519 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -5641,7 +5641,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, SetInitialSize(size); #ifdef __WXMAC__ - MacSetClipChildren( true ); + MacSetClipChildren(); #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp index 1564b3a3f7..9367b14fea 100644 --- a/src/generic/laywin.cpp +++ b/src/generic/laywin.cpp @@ -50,7 +50,7 @@ void wxSashLayoutWindow::Init() m_orientation = wxLAYOUT_HORIZONTAL; m_alignment = wxLAYOUT_TOP; #ifdef __WXMAC__ - MacSetClipChildren( true ) ; + MacSetClipChildren() ; #endif } diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 4f347509be..bcfb096d84 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -444,7 +444,7 @@ void wxScrollHelperBase::DoSetTargetWindow(wxWindow *target) { m_targetWindow = target; #ifdef __WXMAC__ - target->MacSetClipChildren( true ) ; + target->MacSetClipChildren() ; #endif // install the event handler which will intercept the events we're diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 66db08c8eb..2f14570630 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -435,7 +435,7 @@ void wxVarScrollHelperBase::DoSetTargetWindow(wxWindow *target) { m_targetWindow = target; #ifdef __WXMAC__ - target->MacSetClipChildren( true ) ; + target->MacSetClipChildren() ; #endif // install the event handler which will intercept the events we're diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index d8e863bce1..e827553f05 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -4077,7 +4077,7 @@ void wxWidgetCocoaImpl::AdjustClippingView(wxScrollBar* horizontal, wxScrollBar* } } -void wxWidgetCocoaImpl::UseClippingView(bool clip) +void wxWidgetCocoaImpl::UseClippingView() { wxWindow* peer = m_wxPeer; diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 448e360bb7..3c3eceac8f 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -261,11 +261,11 @@ wxWindowMac::~wxWindowMac() delete GetPeer() ; } -void wxWindowMac::MacSetClipChildren( bool clip ) +void wxWindowMac::MacSetClipChildren() { - m_clipChildren = clip ; + m_clipChildren = true ; if ( m_peer ) - m_peer->UseClippingView(clip); + m_peer->UseClippingView(); } WXWidget wxWindowMac::GetHandle() const @@ -394,7 +394,7 @@ bool wxWindowMac::Create(wxWindowMac *parent, SetPeer(wxWidgetImpl::CreateUserPane( this, parent, id, pos, size , style, GetExtraStyle() )); MacPostControlCreate(pos, size) ; if ( m_clipChildren ) - m_peer->UseClippingView(m_clipChildren); + m_peer->UseClippingView(); } wxWindowCreateEvent event((wxWindow*)this); @@ -2715,7 +2715,7 @@ void wxWidgetImpl::AdjustClippingView(wxScrollBar* WXUNUSED(horizontal), wxScrol { } -void wxWidgetImpl::UseClippingView(bool WXUNUSED(clip)) +void wxWidgetImpl::UseClippingView() { }