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.
This commit is contained in:
parent
d4b5c21de7
commit
5dffb76d0a
10 changed files with 14 additions and 14 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -5641,7 +5641,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
|
|||
SetInitialSize(size);
|
||||
|
||||
#ifdef __WXMAC__
|
||||
MacSetClipChildren( true );
|
||||
MacSetClipChildren();
|
||||
#endif
|
||||
|
||||
m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ void wxSashLayoutWindow::Init()
|
|||
m_orientation = wxLAYOUT_HORIZONTAL;
|
||||
m_alignment = wxLAYOUT_TOP;
|
||||
#ifdef __WXMAC__
|
||||
MacSetClipChildren( true ) ;
|
||||
MacSetClipChildren() ;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -4077,7 +4077,7 @@ void wxWidgetCocoaImpl::AdjustClippingView(wxScrollBar* horizontal, wxScrollBar*
|
|||
}
|
||||
}
|
||||
|
||||
void wxWidgetCocoaImpl::UseClippingView(bool clip)
|
||||
void wxWidgetCocoaImpl::UseClippingView()
|
||||
{
|
||||
wxWindow* peer = m_wxPeer;
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue