From 919a8cbb27dded5fe3ae0b1923209f398250fddd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 28 Oct 2022 01:35:34 +0200 Subject: [PATCH] Remove "encoding" argument from string-oriented wxOSX functions This was needed in ANSI build only and so isn't needed any longer now that it's not supported any more, so simplify the code and stop passing fonts/encodings everywhere when we don't actually need them at all. --- include/wx/osx/cocoa/private.h | 4 ++-- include/wx/osx/cocoa/private/textimpl.h | 2 +- include/wx/osx/core/cfstring.h | 13 +++++------ include/wx/osx/core/private.h | 8 +++---- include/wx/osx/iphone/private.h | 4 ++-- src/osx/carbon/app.cpp | 2 +- src/osx/carbon/fontdlgosx.mm | 5 ++--- src/osx/carbon/graphics.cpp | 6 ++--- src/osx/carbon/sound.cpp | 3 +-- src/osx/cocoa/combobox.mm | 6 ++--- src/osx/cocoa/msgdlg.mm | 30 +++++++++++-------------- src/osx/cocoa/nativewin.mm | 2 +- src/osx/cocoa/nonownedwnd.mm | 4 ++-- src/osx/cocoa/notebook.mm | 2 +- src/osx/cocoa/srchctrl.mm | 2 +- src/osx/cocoa/statbmp.mm | 2 +- src/osx/cocoa/statbox.mm | 4 ++-- src/osx/cocoa/stattext.mm | 4 ++-- src/osx/cocoa/textctrl.mm | 12 +++++----- src/osx/cocoa/toolbar.mm | 27 +++++----------------- src/osx/cocoa/utils.mm | 3 +-- src/osx/cocoa/window.mm | 12 +++++----- src/osx/core/cfstring.cpp | 20 ++++++++--------- src/osx/core/fontenum.cpp | 3 +-- src/osx/core/printmac.cpp | 4 ++-- src/osx/iphone/msgdlg.mm | 12 +++++----- src/osx/iphone/nonownedwnd.mm | 2 +- src/osx/iphone/statbmp.mm | 2 +- src/osx/iphone/stattext.mm | 4 ++-- src/osx/iphone/textctrl.mm | 12 +++++----- src/osx/iphone/window.mm | 6 ++--- src/osx/stattext_osx.cpp | 2 +- src/osx/toplevel_osx.cpp | 4 ++-- src/osx/window_osx.cpp | 4 ++-- 34 files changed, 104 insertions(+), 128 deletions(-) diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index c9e9145dee..514e80ffbe 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -129,7 +129,7 @@ public : void SetDefaultButton( bool isDefault ) override; void PerformClick() override; - virtual void SetLabel(const wxString& title, wxFontEncoding encoding) override; + virtual void SetLabel(const wxString& title) override; void SetCursor( const wxCursor & cursor ) override; void CaptureMouse() override; @@ -295,7 +295,7 @@ public : void GetContentArea( int &left, int &top, int &width, int &height ) const override; bool SetShape(const wxRegion& region) override; - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) override; + virtual void SetTitle( const wxString& title ) override; virtual wxContentProtection GetContentProtection() const override; virtual bool SetContentProtection(wxContentProtection contentProtection) override; diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h index a188f4f12c..5050c4d050 100644 --- a/include/wx/osx/cocoa/private/textimpl.h +++ b/include/wx/osx/cocoa/private/textimpl.h @@ -33,7 +33,7 @@ public : virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const override; - virtual void SetInitialLabel(const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding)) override + virtual void SetInitialLabel(const wxString& WXUNUSED(title)) override { // Don't do anything here, text controls don't have any label and // setting it would overwrite the string value set when creating it. diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index d8b819c934..2b1d28adfa 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -38,8 +38,7 @@ public: { } - wxCFStringRef(const wxString &str, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ; + wxCFStringRef(const wxString &str); #ifdef __OBJC__ wxCFStringRef(WX_NSString ref) @@ -62,13 +61,13 @@ public: { } - wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const; + wxString AsString() const; - static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; + static wxString AsString( CFStringRef ref ) ; + static wxString AsStringWithNormalizationFormC( CFStringRef ref ) ; #ifdef __WXMAC__ - static wxString AsString( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - static wxString AsStringWithNormalizationFormC( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; + static wxString AsString( WX_NSString ref ) ; + static wxString AsStringWithNormalizationFormC( WX_NSString ref ) ; #endif #ifdef __OBJC__ WX_NSString AsNSString() const { return (WX_OSX_BRIDGE WX_NSString)(CFStringRef) *this; } diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 2fb0e312ad..453806a1fd 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -322,12 +322,12 @@ public : virtual void SetDefaultButton( bool isDefault ) = 0; virtual void PerformClick() = 0; - virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 0; + virtual void SetLabel( const wxString& title ) = 0; #if wxUSE_MARKUP && wxOSX_USE_COCOA virtual void SetLabelMarkup( const wxString& WXUNUSED(markup) ) { } #endif - virtual void SetInitialLabel( const wxString& title, wxFontEncoding encoding ) - { SetLabel(title, encoding); } + virtual void SetInitialLabel( const wxString& title ) + { SetLabel(title); } virtual void SetCursor( const wxCursor & cursor ) = 0; virtual void CaptureMouse() = 0; @@ -945,7 +945,7 @@ public : return false; } - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0; + virtual void SetTitle( const wxString& title ) = 0; virtual bool EnableCloseButton(bool enable) = 0; virtual bool EnableMaximizeButton(bool enable) = 0; diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h index 2852f48191..75610b61cb 100644 --- a/include/wx/osx/iphone/private.h +++ b/include/wx/osx/iphone/private.h @@ -80,7 +80,7 @@ public : void SetDefaultButton( bool isDefault ); void PerformClick(); - virtual void SetLabel(const wxString& title, wxFontEncoding encoding); + virtual void SetLabel(const wxString& title); void SetCursor( const wxCursor & cursor ); void CaptureMouse(); @@ -163,7 +163,7 @@ public : void GetContentArea( int &left , int &top , int &width , int &height ) const; bool SetShape(const wxRegion& region); - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; + virtual void SetTitle( const wxString& title ) ; // Title bar buttons don't exist in iOS. virtual bool EnableCloseButton(bool WXUNUSED(enable)) { return false; } diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index e5747b6cf7..a4c48ea801 100644 --- a/src/osx/carbon/app.cpp +++ b/src/osx/carbon/app.cpp @@ -311,7 +311,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) CFRelease( url ) ; CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ; CFRelease( urlParent ) ; - wxString cwd = wxCFStringRef(path).AsString(wxLocale::GetSystemEncoding()); + wxString cwd = wxCFStringRef(path).AsString(); wxSetWorkingDirectory( cwd ) ; } diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm index 1e6f804476..30e9fee1d9 100644 --- a/src/osx/carbon/fontdlgosx.mm +++ b/src/osx/carbon/fontdlgosx.mm @@ -21,7 +21,6 @@ #include "wx/fontdlg.h" #ifndef WX_PRECOMP - #include "wx/intl.h" #include "wx/log.h" #include "wx/cmndata.h" #endif @@ -122,8 +121,8 @@ { if ( self = [super initWithFrame:rectBox] ) { - wxCFStringRef cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() ); - wxCFStringRef cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() ); + wxCFStringRef cfOkString( wxT("OK") ); + wxCFStringRef cfCancelString( wxT("Cancel") ); NSRect rectCancel = NSMakeRect( (CGFloat) 10.0 , (CGFloat)10.0 , (CGFloat)82 , (CGFloat)24 ); NSRect rectOK = NSMakeRect( (CGFloat)100.0 , (CGFloat)10.0 , (CGFloat)82 , (CGFloat)24 ); diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index acda667ebf..782433464e 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -2537,7 +2537,7 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo return; wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); - wxCFStringRef text(str, wxLocale::GetSystemEncoding() ); + wxCFStringRef text(str); CGColorRef col = wxMacCreateCGColor( fref->GetColour() ); CTFontRef font = fref->OSXGetCTFont(); @@ -2641,7 +2641,7 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); - wxCFStringRef text(strToMeasure, wxLocale::GetSystemEncoding() ); + wxCFStringRef text(strToMeasure); wxCFRef attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, fref->OSXGetCTFontAttributes() ) ); wxCFRef line( CTLineCreateWithAttributedString(attrtext) ); @@ -2675,7 +2675,7 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); - wxCFStringRef t(text, wxLocale::GetSystemEncoding() ); + wxCFStringRef t(text); wxCFRef attrtext( CFAttributedStringCreate(kCFAllocatorDefault, t, fref->OSXGetCTFontAttributes()) ); wxCFRef line( CTLineCreateWithAttributedString(attrtext) ); diff --git a/src/osx/carbon/sound.cpp b/src/osx/carbon/sound.cpp index 7a9a366395..b929dcf646 100644 --- a/src/osx/carbon/sound.cpp +++ b/src/osx/carbon/sound.cpp @@ -20,7 +20,6 @@ #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/string.h" - #include "wx/intl.h" #include "wx/log.h" #include "wx/timer.h" #endif @@ -280,7 +279,7 @@ bool wxOSXQuickTimeSoundData::Play(unsigned flags) Handle dataRef = nullptr; OSType dataRefType; - err = QTNewDataReferenceFromFullPathCFString(wxCFStringRef(m_sndname,wxLocale::GetSystemEncoding()), + err = QTNewDataReferenceFromFullPathCFString(wxCFStringRef(m_sndname), (UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType); wxASSERT(err == noErr); diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm index 2d2e30762a..caa1622bf6 100644 --- a/src/osx/cocoa/combobox.mm +++ b/src/osx/cocoa/combobox.mm @@ -245,7 +245,7 @@ int wxNSComboBoxControl::GetNumberOfItems() const void wxNSComboBoxControl::InsertItem(int pos, const wxString& item) { - wxCFStringRef itemLabel( item, m_wxPeer->GetFont().GetEncoding() ); + wxCFStringRef itemLabel( item ); NSString* const cocoaStr = itemLabel.AsNSString(); if ( m_wxPeer->HasFlag(wxCB_SORT) ) @@ -289,12 +289,12 @@ void wxNSComboBoxControl::Clear() wxString wxNSComboBoxControl::GetStringAtIndex(int pos) const { - return wxCFStringRef::AsString([m_comboBox itemObjectValueAtIndex:pos], m_wxPeer->GetFont().GetEncoding()); + return wxCFStringRef::AsString([m_comboBox itemObjectValueAtIndex:pos]); } int wxNSComboBoxControl::FindString(const wxString& text) const { - NSInteger nsresult = [m_comboBox indexOfItemWithObjectValue:wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + NSInteger nsresult = [m_comboBox indexOfItemWithObjectValue:wxCFStringRef( text ).AsNSString()]; int result; if (nsresult == NSNotFound) diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm index 6e56893b3d..1e5bce97f3 100644 --- a/src/osx/cocoa/msgdlg.mm +++ b/src/osx/cocoa/msgdlg.mm @@ -91,15 +91,13 @@ int wxMessageDialog::ShowModal() CFStringRef alternateButtonTitle = nullptr; CFStringRef otherButtonTitle = nullptr; - wxFontEncoding encoding = wxFONTENCODING_DEFAULT; + wxCFStringRef cfTitle( msgtitle ); + wxCFStringRef cfText( msgtext ); - wxCFStringRef cfTitle( msgtitle, encoding ); - wxCFStringRef cfText( msgtext, encoding ); - - wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()), encoding ); - wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()), encoding ); - wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()), encoding) ; - wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()), encoding ); + wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()) ); + wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()) ); + wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()) ) ; + wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()) ); NSAlertStyle alertType = GetAlertStyleFromWXStyle(style); @@ -238,15 +236,13 @@ void* wxMessageDialog::ConstructNSAlert() NSAlert* alert = [[NSAlert alloc] init]; NSAlertStyle alertType = GetAlertStyleFromWXStyle(style); - wxFontEncoding encoding = wxFONTENCODING_DEFAULT; - - wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()), encoding ); - wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()), encoding ); - wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()), encoding ); - wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()), encoding ); + wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()) ); + wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()) ); + wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()) ); + wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()) ); - wxCFStringRef cfTitle( msgtitle, encoding ); - wxCFStringRef cfText( msgtext, encoding ); + wxCFStringRef cfTitle( msgtitle ); + wxCFStringRef cfText( msgtext ); [alert setMessageText:cfTitle.AsNSString()]; [alert setInformativeText:cfText.AsNSString()]; @@ -303,7 +299,7 @@ void* wxMessageDialog::ConstructNSAlert() if ( style & wxHELP ) { - wxCFStringRef cfHelpString( GetHelpLabel(), encoding ); + wxCFStringRef cfHelpString( GetHelpLabel() ); [alert addButtonWithTitle:cfHelpString.AsNSString()]; m_buttonId[ m_buttonCount++ ] = wxID_HELP; } diff --git a/src/osx/cocoa/nativewin.mm b/src/osx/cocoa/nativewin.mm index 932a04458a..6179af0405 100644 --- a/src/osx/cocoa/nativewin.mm +++ b/src/osx/cocoa/nativewin.mm @@ -36,7 +36,7 @@ public: wxNativeWidgetCocoaImpl(wxWindowMac* peer, WXWidget w) : wxWidgetCocoaImpl(peer, w) {} - virtual void SetInitialLabel(const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding)) override + virtual void SetInitialLabel(const wxString& WXUNUSED(title)) override { // Don't set initial label, because the control was created by the // caller and is already fully setup. And some controls (notably diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index 0e65b89653..9abd24f748 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -1105,9 +1105,9 @@ bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region)) return true; } -void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) +void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title ) { - [m_macWindow setTitle:wxCFStringRef( title , encoding ).AsNSString()]; + [m_macWindow setTitle:wxCFStringRef( title ).AsNSString()]; } wxContentProtection wxNonOwnedWindowCocoaImpl::GetContentProtection() const diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm index c2fc2e059d..c64edc7bc0 100644 --- a/src/osx/cocoa/notebook.mm +++ b/src/osx/cocoa/notebook.mm @@ -264,7 +264,7 @@ public: wxNotebookPage* page = notebook.GetPage(i); NSTabViewItem* item = [(wxNSTabView*) m_osxView tabViewItemAtIndex:i]; [item setView:page->GetHandle() ]; - wxCFStringRef cf( page->GetLabel() , notebook.GetFont().GetEncoding() ); + wxCFStringRef cf( page->GetLabel() ); [item setLabel:cf.AsNSString()]; const wxBitmapBundle bitmap = notebook.GetPageBitmapBundle(i); diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm index 1d4d855a9b..4718d2bad9 100644 --- a/src/osx/cocoa/srchctrl.mm +++ b/src/osx/cocoa/srchctrl.mm @@ -157,7 +157,7 @@ public : virtual void SetDescriptiveText(const wxString& text) override { [m_searchFieldCell setPlaceholderString: - wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + wxCFStringRef( text ).AsNSString()]; } virtual bool SetFocus() override diff --git a/src/osx/cocoa/statbmp.mm b/src/osx/cocoa/statbmp.mm index c8f902211a..579ae33db3 100644 --- a/src/osx/cocoa/statbmp.mm +++ b/src/osx/cocoa/statbmp.mm @@ -65,7 +65,7 @@ public : { } - void SetLabel( const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding) ) override + void SetLabel( const wxString& WXUNUSED(title) ) override { // although NSControl has this method, NSImageView throws an exception if it is called } diff --git a/src/osx/cocoa/statbox.mm b/src/osx/cocoa/statbox.mm index 1e9f93b7f1..1ba99aaf20 100644 --- a/src/osx/cocoa/statbox.mm +++ b/src/osx/cocoa/statbox.mm @@ -54,14 +54,14 @@ namespace { } - virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) override + virtual void SetLabel( const wxString& title ) override { if (title.empty()) [GetNSBox() setTitlePosition:NSNoTitle]; else [GetNSBox() setTitlePosition:NSAtTop]; - wxWidgetCocoaImpl::SetLabel(title, encoding); + wxWidgetCocoaImpl::SetLabel(title); } private: diff --git a/src/osx/cocoa/stattext.mm b/src/osx/cocoa/stattext.mm index aff3570e38..b1eb91fc42 100644 --- a/src/osx/cocoa/stattext.mm +++ b/src/osx/cocoa/stattext.mm @@ -91,11 +91,11 @@ public: m_lineBreak = lineBreak; } - virtual void SetLabel(const wxString& title, wxFontEncoding encoding) override + virtual void SetLabel(const wxString& title) override { wxMacAutoreleasePool autoreleasepool; - wxCFStringRef text( title , encoding ); + wxCFStringRef text( title ); NSMutableAttributedString * attrstring = [[NSMutableAttributedString alloc] initWithString:text.AsNSString()]; diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index cf66ff17a3..a5dae0a8e2 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -821,7 +821,7 @@ wxString wxNSTextViewControl::GetStringValue() const if (m_textView) { result = wxMacConvertNewlines13To10( - wxCFStringRef::AsString([m_textView string], m_wxPeer->GetFont().GetEncoding())); + wxCFStringRef::AsString([m_textView string])); } return result; } @@ -833,7 +833,7 @@ void wxNSTextViewControl::SetStringValue( const wxString &str) if (m_textView) { wxString st(wxMacConvertNewlines10To13(str)); - [m_textView setString: wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [m_textView setString: wxCFStringRef( st ).AsNSString()]; if ( m_wxPeer->HasFlag(wxTE_AUTO_URL) ) { // Make sure that any URLs in the new text are highlighted. @@ -1022,7 +1022,7 @@ void wxNSTextViewControl::WriteText(const wxString& str) wxString st(wxMacConvertNewlines10To13(str)); wxMacEditHelper helper(m_textView); wxWidgetCocoaNativeKeyDownSuspender suspend(this); - [m_textView insertText:wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [m_textView insertText:wxCFStringRef( st ).AsNSString()]; // Some text styles have to be updated manually. DoUpdateTextStyle(); } @@ -1404,13 +1404,13 @@ wxNSTextFieldControl::~wxNSTextFieldControl() wxString wxNSTextFieldControl::GetStringValue() const { - return wxCFStringRef::AsString([m_textField stringValue], m_wxPeer->GetFont().GetEncoding()); + return wxCFStringRef::AsString([m_textField stringValue]); } void wxNSTextFieldControl::SetStringValue( const wxString &str) { wxMacEditHelper helper(m_textField); - [m_textField setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [m_textField setStringValue: wxCFStringRef( str ).AsNSString()]; } wxTextEntryFormatter* wxNSTextFieldControl::GetFormatter() @@ -1587,7 +1587,7 @@ void wxNSTextFieldControl::WriteText(const wxString& str) BOOL hasUndo = [editor respondsToSelector:@selector(setAllowsUndo:)]; if ( hasUndo ) [(NSTextView*)editor setAllowsUndo:NO]; - [editor insertText:wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [editor insertText:wxCFStringRef( str ).AsNSString()]; if ( hasUndo ) [(NSTextView*)editor setAllowsUndo:YES]; } diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index 8aad6153e6..49c205e23c 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -181,8 +181,8 @@ public: // strip mnemonics from the label for compatibility with the usual // labels in wxStaticText sense - wxCFStringRef l(wxStripMenuCodes(m_label), GetToolBarFontEncoding()); - wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() ); + wxCFStringRef l(wxStripMenuCodes(m_label)); + wxCFStringRef sh( GetShortHelp() ); #if wxOSX_USE_NATIVE_TOOLBAR if ( m_toolbarItem ) { @@ -280,14 +280,6 @@ public: #endif // wxOSX_USE_NATIVE_TOOLBAR private: - wxFontEncoding GetToolBarFontEncoding() const - { - wxFont f; - if ( GetToolBar() ) - f = GetToolBar()->GetFont(); - return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding(); - } - void Init() { m_controlHandle = nullptr; @@ -1175,13 +1167,6 @@ bool wxToolBar::Realize() bool insertAll = false; NSToolbar* refTB = (NSToolbar*)m_macToolbar; - wxFont f; - wxFontEncoding enc; - f = GetFont(); - if ( f.IsOk() ) - enc = f.GetEncoding(); - else - enc = wxFont::GetDefaultEncoding(); node = m_tools.GetFirst(); while ( node ) @@ -1201,7 +1186,7 @@ bool wxToolBar::Realize() { // since setting the help texts is non-virtual we have to update // the strings now - wxCFStringRef sh( tool->GetShortHelp(), enc); + wxCFStringRef sh( tool->GetShortHelp() ); [hiItemRef setToolTip:sh.AsNSString()]; if ( insertAll || (tool->GetIndex() != currentPosition) ) @@ -1521,7 +1506,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) if (m_macToolbar != nullptr) { wxString identifier = wxString::Format(wxT("%ld"), (long) tool); - wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() ); + wxCFStringRef cfidentifier( identifier ); wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ]; [item setImplementation:tool]; tool->SetToolbarItemRef( item ); @@ -1550,7 +1535,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) wxCHECK_MSG( view, false, wxT("control must be non-null") ); wxString identifier = wxString::Format(wxT("%ld"), (long) tool); - wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() ); + wxCFStringRef cfidentifier( identifier ); wxNSToolbarItem* item = [[wxNSToolbarItem alloc] initWithItemIdentifier:cfidentifier.AsNSString() ]; [item setImplementation:tool]; tool->SetToolbarItemRef( item ); @@ -1707,7 +1692,7 @@ void wxToolBar::OSXSelectTool(int toolId) wxCHECK_RET( m_macToolbar, "toolbar must be non-null" ); wxString identifier = wxString::Format(wxT("%ld"), (long)tool); - wxCFStringRef cfidentifier(identifier, wxFont::GetDefaultEncoding()); + wxCFStringRef cfidentifier(identifier); [(NSToolbar*)m_macToolbar setSelectedItemIdentifier:cfidentifier.AsNSString()]; } #endif // wxOSX_USE_NATIVE_TOOLBAR diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 78a12bd90f..0fca6a1e44 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -14,7 +14,6 @@ #include "wx/platinfo.h" #ifndef WX_PRECOMP - #include "wx/intl.h" #include "wx/app.h" #if wxUSE_GUI #include "wx/dialog.h" @@ -95,7 +94,7 @@ void wxBell() CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle() ) ; CFStringRef path = CFURLCopyFileSystemPath ( url , kCFURLPOSIXPathStyle ) ; CFRelease( url ) ; - wxString app = wxCFStringRef(path).AsString(wxLocale::GetSystemEncoding()); + wxString app = wxCFStringRef(path).AsString(); if ( !app.EndsWith(".app") ) { [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular]; diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 7a754b50b2..c59f374f32 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -3334,7 +3334,7 @@ bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style ) return true ; } -void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding ) +void wxWidgetCocoaImpl::SetLabel( const wxString& title ) { if ( [m_osxView respondsToSelector:@selector(setAttributedTitle:) ] ) { @@ -3343,7 +3343,7 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding wxColour col = GetWXPeer()->UseForegroundColour() ? GetWXPeer()->GetForegroundColour() : wxNullColour; if ( f.GetStrikethrough() || f.GetUnderlined() || col.IsOk() ) { - wxCFStringRef cf(title, encoding ); + wxCFStringRef cf(title ); NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:cf.AsNSString()]; @@ -3395,12 +3395,12 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding if ( [m_osxView respondsToSelector:@selector(setTitle:) ] ) { - wxCFStringRef cf( title , encoding ); + wxCFStringRef cf( title ); [m_osxView setTitle:cf.AsNSString()]; } else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] ) { - wxCFStringRef cf( title , encoding ); + wxCFStringRef cf( title ); [m_osxView setStringValue:cf.AsNSString()]; } } @@ -3664,7 +3664,7 @@ void wxWidgetCocoaImpl::SetFont(wxFont const& font) if ([targetView respondsToSelector:@selector(setFont:)]) [targetView setFont: font.OSXGetNSFont()]; if ([m_osxView respondsToSelector:@selector(setAttributedTitle:)]) - SetLabel(wxStripMenuCodes(GetWXPeer()->GetLabel(), wxStrip_Mnemonics), GetWXPeer()->GetFont().GetEncoding()); + SetLabel(wxStripMenuCodes(GetWXPeer()->GetLabel(), wxStrip_Mnemonics)); } void wxWidgetCocoaImpl::SetForegroundColour(const wxColour& col) @@ -3681,7 +3681,7 @@ void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip) { if ( tooltip ) { - wxCFStringRef cf( tooltip->GetTip() , m_wxPeer->GetFont().GetEncoding() ); + wxCFStringRef cf( tooltip->GetTip() ); [m_osxView setToolTip: cf.AsNSString()]; } else diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index 3c4cf5bebb..2fe8a300cb 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -587,7 +587,7 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) // converts this string into a core foundation string with optional pc 2 mac encoding -wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED(encoding) ) +wxCFStringRef::wxCFStringRef( const wxString &st ) { if (st.IsEmpty()) { @@ -622,19 +622,19 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED(encod } } -wxString wxCFStringRef::AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding ) +wxString wxCFStringRef::AsStringWithNormalizationFormC( CFStringRef ref ) { if ( !ref ) return wxEmptyString ; CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(nullptr, 0, ref); CFStringNormalize(cfMutableString,kCFStringNormalizationFormC); - wxString str = wxCFStringRef::AsString(cfMutableString,encoding); + wxString str = wxCFStringRef::AsString(cfMutableString); CFRelease(cfMutableString); return str; } -wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED(encoding) ) +wxString wxCFStringRef::AsString( CFStringRef ref ) { if ( !ref ) return wxEmptyString ; @@ -670,21 +670,21 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED(encod return wxMacConvertNewlines10To13(result); } -wxString wxCFStringRef::AsString(wxFontEncoding encoding) const +wxString wxCFStringRef::AsString() const { - return AsString( get(), encoding ); + return AsString( get() ); } #ifdef __WXMAC__ -wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) +wxString wxCFStringRef::AsString( NSString* ref ) { - return AsString( (CFStringRef) ref, encoding ); + return AsString( (CFStringRef) ref ); } -wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding ) +wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref ) { - return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding ); + return AsStringWithNormalizationFormC( (CFStringRef) ref ); } #endif diff --git a/src/osx/core/fontenum.cpp b/src/osx/core/fontenum.cpp index 6b0f27eed5..e6389999b0 100644 --- a/src/osx/core/fontenum.cpp +++ b/src/osx/core/fontenum.cpp @@ -17,7 +17,6 @@ #ifndef WX_PRECOMP #include "wx/font.h" - #include "wx/intl.h" #endif #include "wx/fontutil.h" @@ -75,7 +74,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, } wxCFStringRef cfName(wxCFRetain(fontName)) ; - fontFamilies.Add(cfName.AsString(wxLocale::GetSystemEncoding())); + fontFamilies.Add(cfName.AsString()); } CFRelease(cfFontFamilies); diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp index 56f585706e..d2fa8382cd 100644 --- a/src/osx/core/printmac.cpp +++ b/src/osx/core/printmac.cpp @@ -203,8 +203,8 @@ void wxOSXPrintData::TransferPaperInfoFrom( const wxPrintData &data ) if ( PMPaperCreateCustom ( printer, - wxCFStringRef(id, wxFont::GetDefaultEncoding()), - wxCFStringRef(name, wxFont::GetDefaultEncoding()), + wxCFStringRef(id), + wxCFStringRef(name), papersize.x, papersize.y, &margins, &paper diff --git a/src/osx/iphone/msgdlg.mm b/src/osx/iphone/msgdlg.mm index c990101cec..f485d85f67 100644 --- a/src/osx/iphone/msgdlg.mm +++ b/src/osx/iphone/msgdlg.mm @@ -60,13 +60,13 @@ int wxMessageDialog::ShowModal() msgtext = m_extendedMessage; } - wxCFStringRef cfNoString( GetNoLabel(), GetFont().GetEncoding() ); - wxCFStringRef cfYesString( GetYesLabel(), GetFont().GetEncoding() ); - wxCFStringRef cfOKString( GetOKLabel(), GetFont().GetEncoding() ); - wxCFStringRef cfCancelString( GetCancelLabel(), GetFont().GetEncoding() ); + wxCFStringRef cfNoString( GetNoLabel() ); + wxCFStringRef cfYesString( GetYesLabel() ); + wxCFStringRef cfOKString( GetOKLabel() ); + wxCFStringRef cfCancelString( GetCancelLabel() ); - wxCFStringRef cfTitle( msgtitle, GetFont().GetEncoding() ); - wxCFStringRef cfText( msgtext, GetFont().GetEncoding() ); + wxCFStringRef cfTitle( msgtitle ); + wxCFStringRef cfText( msgtext ); UIAlertView* alert = [[UIAlertView alloc] initWithTitle:cfTitle.AsNSString() message:cfText.AsNSString() delegate:nil cancelButtonTitle:nil otherButtonTitles:nil]; diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm index accea9574f..f28ab162cf 100644 --- a/src/osx/iphone/nonownedwnd.mm +++ b/src/osx/iphone/nonownedwnd.mm @@ -251,7 +251,7 @@ bool wxNonOwnedWindowIPhoneImpl::SetShape(const wxRegion& region) return false; } -void wxNonOwnedWindowIPhoneImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) +void wxNonOwnedWindowIPhoneImpl::SetTitle( const wxString& title ) { // TODO change title of app ? } diff --git a/src/osx/iphone/statbmp.mm b/src/osx/iphone/statbmp.mm index 6b7dbff435..2b39c86243 100644 --- a/src/osx/iphone/statbmp.mm +++ b/src/osx/iphone/statbmp.mm @@ -41,7 +41,7 @@ public : { } - void SetLabel( const wxString& title, wxFontEncoding encoding ) override + void SetLabel( const wxString& title ) override { // although NSControl has this method, NSImageView throws an exception if it is called } diff --git a/src/osx/iphone/stattext.mm b/src/osx/iphone/stattext.mm index c28cbf29e2..15ede959a1 100644 --- a/src/osx/iphone/stattext.mm +++ b/src/osx/iphone/stattext.mm @@ -52,10 +52,10 @@ public: { } - virtual void SetLabel(const wxString& title, wxFontEncoding encoding) + virtual void SetLabel(const wxString& title) { wxUILabel* v = (wxUILabel*)GetWXWidget(); - wxCFStringRef text( title , encoding ); + wxCFStringRef text( title ); [v setText:text.AsNSString()]; } diff --git a/src/osx/iphone/textctrl.mm b/src/osx/iphone/textctrl.mm index 0469eef440..01904059cc 100644 --- a/src/osx/iphone/textctrl.mm +++ b/src/osx/iphone/textctrl.mm @@ -336,7 +336,7 @@ wxString wxUITextViewControl::GetStringValue() const if (m_textView) { result = wxMacConvertNewlines13To10( - wxCFStringRef::AsString([m_textView text], m_wxPeer->GetFont().GetEncoding())); + wxCFStringRef::AsString([m_textView text])); } return result; } @@ -348,7 +348,7 @@ void wxUITextViewControl::SetStringValue( const wxString &str) if (m_textView) { wxString st(wxMacConvertNewlines10To13(str)); - [m_textView setText: wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [m_textView setText: wxCFStringRef( st ).AsNSString()]; } } @@ -419,7 +419,7 @@ void wxUITextViewControl::WriteText(const wxString& str) wxString st(wxMacConvertNewlines10To13(str)); wxMacEditHelper helper(m_textView); - wxCFStringRef insert( st , m_wxPeer->GetFont().GetEncoding() ); + wxCFStringRef insert( st ); NSMutableString* subst = [NSMutableString stringWithString:[m_textView text]]; [subst replaceCharactersInRange:[m_textView selectedRange] withString:insert.AsNSString()]; @@ -550,13 +550,13 @@ wxUITextFieldControl::~wxUITextFieldControl() wxString wxUITextFieldControl::GetStringValue() const { - return wxCFStringRef::AsString([m_textField text], m_wxPeer->GetFont().GetEncoding()); + return wxCFStringRef::AsString([m_textField text]); } void wxUITextFieldControl::SetStringValue( const wxString &str) { // wxMacEditHelper helper(m_textField); - [m_textField setText: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [m_textField setText: wxCFStringRef( str ).AsNSString()]; } wxSize wxUITextFieldControl::GetBestSize() const @@ -636,7 +636,7 @@ void wxUITextFieldControl::WriteText(const wxString& str) if ( editor ) { wxMacEditHelper helper(m_textField); - [editor insertText:wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()]; + [editor insertText:wxCFStringRef( str ).AsNSString()]; } else #endif diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm index 125bd4d7fd..a66846fcb1 100644 --- a/src/osx/iphone/window.mm +++ b/src/osx/iphone/window.mm @@ -438,17 +438,17 @@ bool wxWidgetIPhoneImpl::SetBackgroundStyle(wxBackgroundStyle style) return true; } -void wxWidgetIPhoneImpl::SetLabel(const wxString& title, wxFontEncoding encoding) +void wxWidgetIPhoneImpl::SetLabel(const wxString& title) { if ( [m_osxView respondsToSelector:@selector(setTitle:forState:) ] ) { - wxCFStringRef cf( title , encoding ); + wxCFStringRef cf( title ); [m_osxView setTitle:cf.AsNSString() forState:UIControlStateNormal ]; } #if 0 // nonpublic API problems else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] ) { - wxCFStringRef cf( title , encoding ); + wxCFStringRef cf( title ); [m_osxView setStringValue:cf.AsNSString()]; } #endif diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp index cea4cf5c19..4b27f1a20b 100644 --- a/src/osx/stattext_osx.cpp +++ b/src/osx/stattext_osx.cpp @@ -101,7 +101,7 @@ bool wxStaticText::SetFont(const wxFont& font) void wxStaticText::WXSetVisibleLabel(const wxString& label) { m_label = RemoveMnemonics(label); - GetPeer()->SetLabel(m_label , GetFont().GetEncoding() ); + GetPeer()->SetLabel(m_label); } #if wxUSE_MARKUP && wxOSX_USE_COCOA diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp index c04a9f2917..ee90dcc586 100644 --- a/src/osx/toplevel_osx.cpp +++ b/src/osx/toplevel_osx.cpp @@ -73,7 +73,7 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, return false; wxWindow::SetLabel( title ) ; - m_nowpeer->SetTitle(title, GetFont().GetEncoding() ); + m_nowpeer->SetTitle(title); wxTopLevelWindows.Append(this); return true; @@ -160,7 +160,7 @@ void wxTopLevelWindowMac::SetTitle(const wxString& title) m_label = title ; if ( m_nowpeer ) - m_nowpeer->SetTitle(title, GetFont().GetEncoding() ); + m_nowpeer->SetTitle(title); } wxString wxTopLevelWindowMac::GetTitle() const diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 2541423c88..c40b26fe73 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -330,7 +330,7 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer) if ( !m_hasFont ) DoSetWindowVariant( m_windowVariant ); - GetPeer()->SetInitialLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ; + GetPeer()->SetInitialLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ; // for controls we want to use best size for wxDefaultSize params ) if ( !GetPeer()->IsUserPane() ) @@ -1185,7 +1185,7 @@ void wxWindowMac::SetLabel(const wxString& title) InvalidateBestSize(); if ( GetPeer() && GetPeer()->IsOk() ) - GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ; + GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ; // do not trigger refreshes upon invisible and possible partly created objects if ( IsShownOnScreen() )