Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace references to wxLocale by wxUILocale

Browse Source 
Use newer wxUILocale class directly instead of using wxLocale functions
that forward to it anyhow.

No real changes.

Closes #22375.
This commit is contained in:
utelle
2022-04-29 09:19:58 +02:00
committed by Vadim Zeitlin
parent a7791781d9
commit 1c65e88221
10 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/appcmn.cpp
View File

@@ -39,6 +39,7 @@
#include "wx/thread.h"
#include "wx/vidmode.h"
#include "wx/evtloop.h"
#include "wx/uilocale.h"
#if wxUSE_FONTMAP
#include "wx/fontmap.h"
@@ -206,19 +207,11 @@ wxVideoMode wxAppBase::GetDisplayMode() const
wxLayoutDirection wxAppBase::GetLayoutDirection() const
{
#if wxUSE_INTL
const wxLocale *const locale = wxGetLocale();
if ( locale )
{
const wxLanguageInfo *const
info = wxLocale::GetLanguageInfo(locale->GetLanguage());
if ( info )
return info->LayoutDirection;
}
#endif // wxUSE_INTL
return wxUILocale::GetCurrent().GetLayoutDirection();
#else
// we don't know
return wxLayout_Default;
#endif // wxUSE_INTL
}
#if wxUSE_CMDLINE_PARSER

15
src/common/datetimefmt.cpp
View File

@@ -52,6 +52,7 @@
#include "wx/datetime.h"
#include "wx/time.h"
#include "wx/uilocale.h"
// ============================================================================
// implementation of wxDateTime
@@ -320,11 +321,11 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
wxString format = formatp;
#ifdef __WXOSX__
if ( format.Contains("%c") )
format.Replace("%c", wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT));
format.Replace("%c", wxUILocale::GetCurrent().GetInfo(wxLOCALE_DATE_TIME_FMT));
if ( format.Contains("%x") )
format.Replace("%x", wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT));
format.Replace("%x", wxUILocale::GetCurrent().GetInfo(wxLOCALE_SHORT_DATE_FMT));
if ( format.Contains("%X") )
format.Replace("%X", wxLocale::GetInfo(wxLOCALE_TIME_FMT));
format.Replace("%X", wxUILocale::GetCurrent().GetInfo(wxLOCALE_TIME_FMT));
#endif
// we have to use our own implementation if the date is out of range of
// strftime()
@@ -1177,7 +1178,7 @@ wxDateTime::ParseFormat(const wxString& date,
#if wxUSE_INTL
const wxString
fmtDateTime = wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT);
fmtDateTime = wxUILocale::GetCurrent().GetInfo(wxLOCALE_DATE_TIME_FMT);
if ( !fmtDateTime.empty() )
dt = ParseFormatAt(input, end, fmtDateTime);
#endif // wxUSE_INTL
@@ -1399,8 +1400,8 @@ wxDateTime::ParseFormat(const wxString& date,
{
#if wxUSE_INTL
wxString
fmtDate = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT),
fmtDateAlt = wxLocale::GetInfo(wxLOCALE_LONG_DATE_FMT);
fmtDate = wxUILocale::GetCurrent().GetInfo(wxLOCALE_SHORT_DATE_FMT),
fmtDateAlt = wxUILocale::GetCurrent().GetInfo(wxLOCALE_LONG_DATE_FMT);
#else // !wxUSE_INTL
wxString fmtDate, fmtDateAlt;
#endif // wxUSE_INTL/!wxUSE_INTL
@@ -1449,7 +1450,7 @@ wxDateTime::ParseFormat(const wxString& date,
case wxT('X'): // locale default time representation
{
#if wxUSE_INTL
wxString fmtTime = wxLocale::GetInfo(wxLOCALE_TIME_FMT),
wxString fmtTime = wxUILocale::GetCurrent().GetInfo(wxLOCALE_TIME_FMT),
fmtTimeAlt;
#else // !wxUSE_INTL
wxString fmtTime, fmtTimeAlt;

9
src/common/string.cpp
View File

@@ -32,6 +32,7 @@
#include <stdlib.h>
#include "wx/hashmap.h"
#include "wx/uilocale.h"
#include "wx/vector.h"
#include "wx/xlocale.h"
@@ -1811,8 +1812,8 @@ bool wxString::ToCDouble(double *pVal) const
// Create a copy of this string using the decimal point instead of whatever
// separator the current locale uses.
#if wxUSE_INTL
wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
wxLOCALE_CAT_NUMBER);
wxString sep = wxUILocale::GetCurrent().GetInfo(wxLOCALE_DECIMAL_POINT,
wxLOCALE_CAT_NUMBER);
if ( sep == "." )
{
// We can avoid an unnecessary string copy in this case.
@@ -1880,8 +1881,8 @@ wxString wxString::FromCDouble(double val, int precision)
wxString s = FromDouble(val, precision);
#if wxUSE_INTL
wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
wxLOCALE_CAT_NUMBER);
wxString sep = wxUILocale::GetCurrent().GetInfo(wxLOCALE_DECIMAL_POINT,
wxLOCALE_CAT_NUMBER);
#else // !wxUSE_INTL
// As above, this is the most common alternative value. Notice that here it
// doesn't matter if we guess wrongly and the current separator is already

3
src/common/xlocale.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/module.h"
#endif
#include "wx/uilocale.h"
#include "wx/xlocale.h"
#include <errno.h>
@@ -89,7 +90,7 @@ wxXLocale::wxXLocale(wxLanguage lang)
{
m_locale = NULL;
const wxLanguageInfo * const info = wxLocale::GetLanguageInfo(lang);
const wxLanguageInfo * const info = wxUILocale::GetLanguageInfo(lang);
if ( info )
{
Init(info->GetLocaleName().c_str());

3
src/generic/datectlg.cpp
View File

@@ -35,6 +35,7 @@
#include "wx/datectrl.h"
#include "wx/generic/datectrl.h"
#include "wx/uilocale.h"
// ----------------------------------------------------------------------------
// constants
@@ -243,7 +244,7 @@ private:
wxString GetLocaleDateFormat() const
{
#if wxUSE_INTL
wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT);
wxString fmt = wxUILocale::GetCurrent().GetInfo(wxLOCALE_SHORT_DATE_FMT);
if ( HasDPFlag(wxDP_SHOWCENTURY) )
fmt.Replace("%y", "%Y");

7
src/generic/helpext.cpp
View File

@@ -26,6 +26,7 @@
#include "wx/filename.h"
#include "wx/textfile.h"
#include "wx/generic/helpext.h"
#include "wx/uilocale.h"
#include <stdio.h>
#include <ctype.h>
@@ -220,10 +221,10 @@ bool wxExtHelpController::LoadFile(const wxString& file)
// "/usr/local/myapp/help" and the current wxLocale is set to be "de", then
// look in "/usr/local/myapp/help/de/" first and fall back to
// "/usr/local/myapp/help" if that doesn't exist.
const wxLocale * const loc = wxGetLocale();
if ( loc )
wxLocaleIdent locId = wxUILocale::GetCurrent().GetLocaleId();
if ( !locId.IsEmpty() )
{
wxString locName = loc->GetName();
wxString locName = locId.GetTag(wxLOCALE_TAGTYPE_POSIX);
// the locale is in general of the form xx_YY.zzzz, try the full firm
// first and then also more general ones

3
src/generic/timectrlg.cpp
View File

@@ -27,6 +27,7 @@
#endif // WX_PRECOMP
#include "wx/timectrl.h"
#include "wx/uilocale.h"
// This class is only compiled if there is no native version or if we
// explicitly want to use both the native and generic one (this is useful for
@@ -85,7 +86,7 @@ public:
// instead of zeros) too as this is the most common unsupported case in
// practice.
#if wxUSE_INTL
m_useAMPM = wxLocale::GetInfo(wxLOCALE_TIME_FMT).Contains("%p");
m_useAMPM = wxUILocale::GetCurrent().GetInfo(wxLOCALE_TIME_FMT).Contains("%p");
#else
m_useAMPM = false;
#endif

3
src/msw/datetimectrl.cpp
View File

@@ -20,6 +20,7 @@
#include "wx/datetimectrl.h"
#include "wx/uilocale.h"
#ifdef wxNEEDS_DATETIMEPICKCTRL
@@ -231,7 +232,7 @@ wxSize wxDateTimePickerCtrl::DoGetBestSize() const
{
// Use the same native format as the underlying native control.
#if wxUSE_INTL
wxString s = wxDateTime::Now().Format(wxLocale::GetOSInfo(MSWGetFormat()));
wxString s = wxDateTime::Now().Format(wxUILocale::GetCurrent().GetInfo(MSWGetFormat()));
#else // !wxUSE_INTL
wxString s("XXX-YYY-ZZZZ");
#endif // wxUSE_INTL/!wxUSE_INTL

4
src/propgrid/advprops.cpp
View File

@@ -31,6 +31,8 @@
#include "wx/odcombo.h"
#include "wx/uilocale.h"
// Drawing ARGB on standard DC is supported by OSX and GTK3
#if defined(__WXOSX__) || defined(__WXGTK3__)
#define wxPG_DC_SUPPORTS_ALPHA 1
@@ -2226,7 +2228,7 @@ wxString wxDateProperty::DetermineDefaultDateFormat( bool showCentury )
{
// This code is based on datectlg.cpp's GetLocaleDateFormat()
#if wxUSE_INTL
wxString format = wxLocale::GetOSInfo(wxLOCALE_SHORT_DATE_FMT);
wxString format = wxUILocale::GetCurrent().GetInfo(wxLOCALE_SHORT_DATE_FMT);
if ( showCentury )
format.Replace(wxS("%y"), wxS("%Y"));
else

10
src/unix/mimetype.cpp
View File

@@ -34,6 +34,7 @@
#include "wx/filename.h"
#include "wx/app.h"
#include "wx/apptrait.h"
#include "wx/uilocale.h"
// other standard headers
#include <ctype.h>
@@ -155,9 +156,8 @@ void wxMimeTypesManagerImpl::LoadXDGApp(const wxString& filename)
wxString nameapp;
nIndex = wxNOT_FOUND;
#if wxUSE_INTL // try "Name[locale name]" first
wxLocale *locale = wxGetLocale();
if ( locale )
nIndex = file.pIndexOf(wxT("Name[")+locale->GetName()+wxT("]="));
if ( wxUILocale::GetCurrent().IsSupported() )
nIndex = file.pIndexOf(wxT("Name[")+wxUILocale::GetCurrent().GetName()+wxT("]="));
#endif // wxUSE_INTL
if(nIndex == wxNOT_FOUND)
nIndex = file.pIndexOf( wxT("Name=") );
@@ -168,8 +168,8 @@ void wxMimeTypesManagerImpl::LoadXDGApp(const wxString& filename)
wxString nameicon, namemini;
nIndex = wxNOT_FOUND;
#if wxUSE_INTL // try "Icon[locale name]" first
if ( locale )
nIndex = file.pIndexOf(wxT("Icon[")+locale->GetName()+wxT("]="));
if ( wxUILocale::GetCurrent().IsSupported() )
nIndex = file.pIndexOf(wxT("Icon[")+wxUILocale::GetCurrent().GetName()+wxT("]="));
#endif // wxUSE_INTL
if(nIndex == wxNOT_FOUND)
nIndex = file.pIndexOf( wxT("Icon=") );