From 4aafab47e717ea18623b1f8c978e8cb3b35d1b06 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 25 Oct 2020 17:49:37 +0100 Subject: [PATCH] Simplify SetFont() in wxOSX implementations It doesn't need to take the colour and other parameters unused any more. Closes https://github.com/wxWidgets/wxWidgets/pull/2103 --- include/wx/osx/cocoa/dataview.h | 2 +- include/wx/osx/cocoa/private.h | 2 +- include/wx/osx/cocoa/private/textimpl.h | 2 +- include/wx/osx/core/private.h | 2 +- include/wx/osx/iphone/private.h | 2 +- include/wx/osx/iphone/private/textimpl.h | 2 +- src/osx/cocoa/dataview.mm | 4 ++-- src/osx/cocoa/textctrl.mm | 2 +- src/osx/cocoa/window.mm | 5 ++++- src/osx/iphone/textctrl.mm | 2 +- src/osx/iphone/window.mm | 2 +- src/osx/textctrl_osx.cpp | 2 +- src/osx/window_osx.cpp | 2 +- 13 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 41d16201d8..57c7a8f072 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -548,7 +548,7 @@ public: // Cocoa-specific helpers id GetItemAtRow(int row) const; - virtual void SetFont(const wxFont& font, const wxColour& foreground, long windowStyle, bool ignoreBlack = true); + virtual void SetFont(const wxFont& font); private: void InitOutlineView(long style); diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index ea782e9fae..3e6dc20a6e 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -150,7 +150,7 @@ public : void PulseGauge() wxOVERRIDE; void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE; - void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack = true ) wxOVERRIDE; + void SetFont(const wxFont & font) wxOVERRIDE; void SetToolTip( wxToolTip* tooltip ) wxOVERRIDE; void InstallEventHandler( WXWidget control = NULL ) wxOVERRIDE; diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h index b0e19367b0..0874cbc905 100644 --- a/include/wx/osx/cocoa/private/textimpl.h +++ b/include/wx/osx/cocoa/private/textimpl.h @@ -118,7 +118,7 @@ public: virtual long XYToPosition(long x, long y) const wxOVERRIDE; virtual void ShowPosition(long pos) wxOVERRIDE; virtual void WriteText(const wxString& str) wxOVERRIDE ; - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) wxOVERRIDE; + virtual void SetFont(const wxFont & font) wxOVERRIDE; virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; virtual void SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index eb27786c47..a25b3e104e 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -348,7 +348,7 @@ public : virtual void PulseGauge() = 0; virtual void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0; - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0; + virtual void SetFont(const wxFont & font) = 0; virtual void SetToolTip(wxToolTip* WXUNUSED(tooltip)) { } diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h index a0694ed2d7..53a3e926ce 100644 --- a/include/wx/osx/iphone/private.h +++ b/include/wx/osx/iphone/private.h @@ -102,7 +102,7 @@ public : void PulseGauge(); void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ); - void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); + void SetFont(const wxFont & font); void InstallEventHandler( WXWidget control = NULL ); bool EnableTouchEvents(int WXUNUSED(eventsMask)) { return false; } diff --git a/include/wx/osx/iphone/private/textimpl.h b/include/wx/osx/iphone/private/textimpl.h index 4019881872..96b52e6d05 100644 --- a/include/wx/osx/iphone/private/textimpl.h +++ b/include/wx/osx/iphone/private/textimpl.h @@ -62,7 +62,7 @@ public: virtual void GetSelection( long* from, long* to) const ; virtual void SetSelection( long from , long to ); virtual void WriteText(const wxString& str) ; - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); + virtual void SetFont(const wxFont & font); virtual bool GetStyle(long position, wxTextAttr& style); virtual void SetStyle(long start, long end, const wxTextAttr& style); diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 770719e4a9..77ff3da90a 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -2719,9 +2719,9 @@ id wxCocoaDataViewControl::GetItemAtRow(int row) const return [m_OutlineView itemAtRow:row]; } -void wxCocoaDataViewControl::SetFont(const wxFont& font, const wxColour& foreground, long windowStyle, bool ignoreBlack) +void wxCocoaDataViewControl::SetFont(const wxFont& font) { - wxWidgetCocoaImpl::SetFont(font, foreground, windowStyle, ignoreBlack); + wxWidgetCocoaImpl::SetFont(font); SetRowHeight(0/*will use default/minimum height*/); } diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index c1d18b5589..798b275d92 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -1021,7 +1021,7 @@ void wxNSTextViewControl::DoUpdateTextStyle() } } -void wxNSTextViewControl::SetFont( const wxFont & font , const wxColour& WXUNUSED(foreground) , long WXUNUSED(windowStyle), bool WXUNUSED(ignoreBlack) ) +void wxNSTextViewControl::SetFont(const wxFont & font) { if ([m_textView respondsToSelector:@selector(setFont:)]) [m_textView setFont: font.OSXGetNSFont()]; diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 467998f485..aad774429f 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -3593,7 +3593,7 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) } } -void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool) +void wxWidgetCocoaImpl::SetFont(wxFont const& font) { NSView* targetView = m_osxView; if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) @@ -3604,7 +3604,10 @@ void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bo if ([targetView respondsToSelector:@selector(setFont:)]) [targetView setFont: font.OSXGetNSFont()]; if ([targetView respondsToSelector:@selector(setTextColor:)]) + { + wxColor col = GetWXPeer()->GetForegroundColour(); [targetView setTextColor: col.OSXGetNSColor()]; + } if ([m_osxView respondsToSelector:@selector(setAttributedTitle:)]) SetLabel(wxStripMenuCodes(GetWXPeer()->GetLabel(), wxStrip_Mnemonics), GetWXPeer()->GetFont().GetEncoding()); } diff --git a/src/osx/iphone/textctrl.mm b/src/osx/iphone/textctrl.mm index 190afe6a06..7a1d785c64 100644 --- a/src/osx/iphone/textctrl.mm +++ b/src/osx/iphone/textctrl.mm @@ -426,7 +426,7 @@ void wxUITextViewControl::WriteText(const wxString& str) [m_textView setText:subst]; } -void wxUITextViewControl::SetFont( const wxFont & font , const wxColour& WXUNUSED(foreground) , long WXUNUSED(windowStyle), bool WXUNUSED(ignoreBlack) ) +void wxUITextViewControl::SetFont(const wxFont & font) { if ([m_textView respondsToSelector:@selector(setFont:)]) [m_textView setFont: font.OSXGetUIFont()]; diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm index 50bdd3ff7c..2dd707c28c 100644 --- a/src/osx/iphone/window.mm +++ b/src/osx/iphone/window.mm @@ -622,7 +622,7 @@ double wxWidgetIPhoneImpl::GetContentScaleFactor() const return 1.0; } -void wxWidgetIPhoneImpl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack ) +void wxWidgetIPhoneImpl::SetFont(const wxFont & font) { } diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp index cdf998c5c6..118bf388c3 100644 --- a/src/osx/textctrl_osx.cpp +++ b/src/osx/textctrl_osx.cpp @@ -150,7 +150,7 @@ bool wxTextCtrl::SetFont( const wxFont& font ) if ( !wxTextCtrlBase::SetFont( font ) ) return false ; - GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle(), false /* dont ignore black */ ) ; + GetPeer()->SetFont(font) ; return true ; } diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 6e349163ff..6ab7dc8152 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -507,7 +507,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) void wxWindowMac::MacUpdateControlFont() { if ( GetPeer() ) - GetPeer()->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; + GetPeer()->SetFont(GetFont()) ; // do not trigger refreshes upon invisible and possible partly created objects if ( IsShownOnScreen() )