Merge branch 'misc-mac-fixes'

Some minor changes to get rid of a few warnings in Mac build.

See #24123.
This commit is contained in:
Vadim Zeitlin 2023-12-12 20:03:56 +01:00
commit 18ce5a07fd
13 changed files with 23 additions and 21 deletions

View file

@ -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:

View file

@ -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;

View file

@ -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)

View file

@ -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

View file

@ -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