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

Rename wxPlatformInfo::*Arch* to *Bitness*, deprecate old names

Browse Source
This commit is contained in:
Lauri Nurmi
2020-11-21 17:48:42 +02:00
parent 68ea3c59f1
commit b74702543b
4 changed files with 102 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/platinfo.h
View File

@@ -85,16 +85,25 @@ enum wxPortId
// architecture bitness of the operating system
// (regardless of the build environment of wxWidgets library - see
// wxIsPlatform64bit documentation for more info)
enum wxArchitecture
enum wxBitness
{
wxARCH_INVALID = -1, // returned on error
wxBITNESS_INVALID = -1, // returned on error
wxARCH_32, // 32 bit
wxARCH_64,
wxBITNESS_32,
wxBITNESS_64,
wxARCH_MAX
wxBITNESS_MAX
};
typedef wxBitness wxArchitecture;
const wxArchitecture
wxARCH_INVALID = wxBITNESS_INVALID,
wxARCH_32 = wxBITNESS_32,
wxARCH_64 = wxBITNESS_64,
wxARCH_MAX = wxBITNESS_MAX;
// endian-ness of the machine
enum wxEndianness
@@ -143,7 +152,7 @@ public:
int tkMajor = -1, int tkMinor = -1,
wxOperatingSystemId id = wxOS_UNKNOWN,
int osMajor = -1, int osMinor = -1,
wxArchitecture arch = wxARCH_INVALID,
wxBitness bitness = wxBITNESS_INVALID,
wxEndianness endian = wxENDIAN_INVALID,
bool usingUniversal = false);
@@ -166,6 +175,8 @@ public:
static wxOperatingSystemId GetOperatingSystemId(const wxString &name);
static wxPortId GetPortId(const wxString &portname);
static wxBitness GetBitness(const wxString &bitness);
wxDEPRECATED_MSG("Use GetBitness() instead")
static wxArchitecture GetArch(const wxString &arch);
static wxEndianness GetEndianness(const wxString &end);
@@ -177,6 +188,8 @@ public:
static wxString GetPortIdName(wxPortId port, bool usingUniversal);
static wxString GetPortIdShortName(wxPortId port, bool usingUniversal);
static wxString GetBitnessName(wxBitness bitness);
wxDEPRECATED_MSG("Use GetBitnessName() instead")
static wxString GetArchName(wxArchitecture arch);
static wxString GetEndiannessName(wxEndianness end);
@@ -220,8 +233,11 @@ public:
{ return m_ldi; }
wxPortId GetPortId() const
{ return m_port; }
wxBitness GetBitness() const
{ return m_bitness; }
wxDEPRECATED_MSG("Use GetBitness() instead")
wxArchitecture GetArchitecture() const
{ return m_arch; }
{ return GetBitness(); }
wxEndianness GetEndianness() const
{ return m_endian; }
@@ -237,8 +253,11 @@ public:
{ return GetPortIdName(m_port, m_usingUniversal); }
wxString GetPortIdShortName() const
{ return GetPortIdShortName(m_port, m_usingUniversal); }
wxString GetBitnessName() const
{ return GetBitnessName(m_bitness); }
wxDEPRECATED_MSG("Use GetBitnessName() instead")
wxString GetArchName() const
{ return GetArchName(m_arch); }
{ return GetBitnessName(); }
wxString GetEndiannessName() const
{ return GetEndiannessName(m_endian); }
wxString GetOperatingSystemDescription() const
@@ -275,8 +294,11 @@ public:
{ m_osDesc = desc; }
void SetPortId(wxPortId n)
{ m_port = n; }
void SetArchitecture(wxArchitecture n)
{ m_arch = n; }
void SetBitness(wxBitness n)
{ m_bitness = n; }
wxDEPRECATED_MSG("Use SetBitness() instead")
void SetArchitecture(wxBitness n)
{ SetBitness(n); }
void SetEndianness(wxEndianness n)
{ m_endian = n; }
@@ -298,7 +320,7 @@ public:
m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
m_tkVersionMicro != -1 &&
m_port != wxPORT_UNKNOWN &&
m_arch != wxARCH_INVALID &&
m_bitness != wxBITNESS_INVALID &&
m_endian != wxENDIAN_INVALID;
// do not check linux-specific info; it's ok to have them empty
@@ -360,7 +382,7 @@ protected:
// -----------------
// architecture bitness of the OS/machine
wxArchitecture m_arch;
wxBitness m_bitness;
// endianness of the machine
wxEndianness m_endian;