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/platform.h b/include/wx/platform.h
index b77b5bd86c..8597797767 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -455,6 +455,9 @@
 #        ifndef MAC_OS_X_VERSION_10_16
 #           define MAC_OS_X_VERSION_10_16 101600
 #        endif
+         /*
+            Note that since macOS 11 there is no more "X" in the names.
+          */
 #        ifndef MAC_OS_VERSION_11_0
 #           define MAC_OS_VERSION_11_0 110000
 #        endif
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/common/appbase.cpp b/src/common/appbase.cpp
index 1de2d9c468..b8d912b8bd 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -1023,19 +1023,18 @@ wxString wxAppTraitsBase::GetAssertStackTrace()
 
             if ( !name.empty() )
             {
-                m_stackTrace << wxString::Format(wxT("%-40s"), name.c_str());
+                m_stackTrace << wxString::Format("%-80s", name);
             }
             else
             {
-                m_stackTrace << wxString::Format(wxT("%p"), frame.GetAddress());
+                m_stackTrace << wxString::Format("%-80p", frame.GetAddress());
             }
 
             if ( frame.HasSourceLocation() )
             {
-                m_stackTrace << wxT('\t')
-                             << frame.GetFileName()
-                             << wxT(':')
-                             << frame.GetLine();
+                m_stackTrace << wxString::Format("%s:%zu",
+                                                 frame.GetFileName(),
+                                                 frame.GetLine());
             }
 
             m_stackTrace << wxT('\n');
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/renderer.mm b/src/osx/cocoa/renderer.mm
index 1fe4a98b0b..484de678ee 100644
--- a/src/osx/cocoa/renderer.mm
+++ b/src/osx/cocoa/renderer.mm
@@ -618,7 +618,7 @@ void wxRendererMac::ApplyMacControlFlags(wxWindow* win, NSCell* cell, int flags)
         size = NSSmallControlSize;
     else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
         size = NSMiniControlSize;
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_11_0
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0
     else if (win->GetWindowVariant() == wxWINDOW_VARIANT_LARGE|| (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_LARGE))
     {
         if (WX_IS_MACOS_AVAILABLE(11, 0))
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()
 {
 }