From f95dd972d9ec5d22f5996f56b9757af0bf3ca397 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 27 May 2009 09:52:23 +0000 Subject: [PATCH] allowing font changes on multi-line textctrls, see #10801 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/cocoa/private/textimpl.h | 1 + src/osx/cocoa/textctrl.mm | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h index def931fa95..98962b3157 100644 --- a/include/wx/osx/cocoa/private/textimpl.h +++ b/include/wx/osx/cocoa/private/textimpl.h @@ -56,6 +56,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 ); protected: NSScrollView* m_scrollView; diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index a8537ae536..6814c6cdd5 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -429,6 +429,13 @@ void wxNSTextViewControl::WriteText(const wxString& str) [m_textView insertText:wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; } +void wxNSTextViewControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack ) +{ + if ([m_textView respondsToSelector:@selector(setFont:)]) + [m_textView setFont: font.OSXGetNSFont()]; +} + + // wxNSTextFieldControl wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w) -- 2.45.2