#pragma hdrstop
#endif
+#include "wx/platinfo.h"
+
#ifndef WX_PRECOMP
+ #include "wx/app.h"
#include "wx/utils.h"
#endif //WX_PRECOMP
-#include "wx/platinfo.h"
#include "wx/apptrait.h"
+// global object
+// VERY IMPORTANT: do not use the default constructor since it would
+// try to init the wxPlatformInfo instance using
+// gs_platInfo itself!
+static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN);
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-static wxString wxOperatingSystemIdNames[] =
+static const wxChar* const wxOperatingSystemIdNames[] =
{
_T("Apple Mac OS"),
_T("Apple Mac OS X"),
_T("AIX"),
_T("HPUX"),
+ _T("Other Unix"),
+ _T("Other Unix"),
+
_T("DOS"),
- _T("OS/2")
+ _T("OS/2"),
+
+ _T("PalmOS"),
+ _T("PalmOS(Over Linux)"),
};
-static wxString wxPortIdNames[] =
+static const wxChar* const wxPortIdNames[] =
{
_T("wxBase"),
_T("wxMSW"),
_T("wxMac"),
_T("wxCocoa"),
_T("wxWinCE"),
- _T("wxPalmOS")
+ _T("wxPalmOS"),
+ _T("wxDFB")
};
-static wxString wxArchitectureNames[] =
+static const wxChar* const wxArchitectureNames[] =
{
_T("32 bit"),
_T("64 bit")
};
-static wxString wxEndiannessNames[] =
+static const wxChar* const wxEndiannessNames[] =
{
_T("Big endian"),
_T("Little endian"),
// returns log in base 2 of the value, this maps the enum values to the
// corresponding indices
-static int wxGetIndexFromEnumValue(int value)
+static unsigned wxGetIndexFromEnumValue(int value)
{
- wxCHECK_MSG( value, -1, _T("invalid enum value") );
+ wxCHECK_MSG( value, (unsigned)-1, _T("invalid enum value") );
int n = 0;
while ( !(value & 1) )
wxPlatformInfo::wxPlatformInfo()
{
- // autodetect all informations
- const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
- if ( !traits )
- {
- wxFAIL_MSG( _T("failed to initialize wxPlatformInfo") );
-
- m_port = wxPORT_UNKNOWN;
- m_tkVersionMajor =
- m_tkVersionMinor = 0;
- }
- else
- {
- m_port = traits->GetToolkitVersion(&m_tkVersionMajor, &m_tkVersionMinor);
- }
-
- m_os = wxGetOsVersion(&m_osVersionMajor, &m_osVersionMinor);
- m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
- m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;
+ // just copy platform info for currently running platform
+ *this = Get();
}
wxPlatformInfo::wxPlatformInfo(wxPortId pid, int tkMajor, int tkMinor,
wxOperatingSystemId id, int osMajor, int osMinor,
wxArchitecture arch,
- wxEndianness endian)
+ wxEndianness endian,
+ bool usingUniversal)
{
m_tkVersionMajor = tkMajor;
m_tkVersionMinor = tkMinor;
m_port = pid;
+ m_usingUniversal = usingUniversal;
m_os = id;
m_osVersionMajor = osMajor;
m_osVersionMinor == t.m_osVersionMinor &&
m_os == t.m_os &&
m_port == t.m_port &&
+ m_usingUniversal == t.m_usingUniversal &&
m_arch == t.m_arch &&
m_endian == t.m_endian;
}
+void wxPlatformInfo::InitForCurrentPlatform()
+{
+ // autodetect all informations
+ const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+ if ( !traits )
+ {
+ wxFAIL_MSG( _T("failed to initialize wxPlatformInfo") );
+
+ m_port = wxPORT_UNKNOWN;
+ m_usingUniversal = false;
+ m_tkVersionMajor =
+ m_tkVersionMinor = 0;
+ }
+ else
+ {
+ m_port = traits->GetToolkitVersion(&m_tkVersionMajor, &m_tkVersionMinor);
+ m_usingUniversal = traits->IsUsingUniversalWidgets();
+ }
+
+ m_os = wxGetOsVersion(&m_osVersionMajor, &m_osVersionMinor);
+ m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
+ m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;
+}
+
+/* static */
+const wxPlatformInfo& wxPlatformInfo::Get()
+{
+ static bool initialized = false;
+ if ( !initialized )
+ {
+ gs_platInfo.InitForCurrentPlatform();
+ initialized = true;
+ }
+
+ return gs_platInfo;
+}
+
+
+
// ----------------------------------------------------------------------------
// wxPlatformInfo - enum -> string conversions
// ----------------------------------------------------------------------------
wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
{
+ const wxChar* string = _T("Unknown");
if ( os & wxOS_MAC )
- return _T("Macintosh");
+ string = _T("Macintosh");
else if ( os & wxOS_WINDOWS )
- return _T("Windows");
+ string = _T("Windows");
else if ( os & wxOS_UNIX )
- return _T("Unix");
+ string = _T("Unix");
else if ( os == wxOS_DOS )
- return _T("DOS");
+ string = _T("DOS");
else if ( os == wxOS_OS2 )
- return _T("OS/2");
+ string = _T("OS/2");
- return _T("Unknown");
+ return string;
}
wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os)
{
- const int idx = wxGetIndexFromEnumValue(os);
+ const unsigned idx = wxGetIndexFromEnumValue(os);
wxCHECK_MSG( idx < WXSIZEOF(wxOperatingSystemIdNames), wxEmptyString,
_T("invalid OS id") );
return wxOperatingSystemIdNames[idx];
}
-wxString wxPlatformInfo::GetPortIdName(wxPortId port)
+wxString wxPlatformInfo::GetPortIdName(wxPortId port, bool usingUniversal)
{
- const int idx = wxGetIndexFromEnumValue(port);
+ const unsigned idx = wxGetIndexFromEnumValue(port);
wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
_T("invalid port id") );
wxString ret = wxPortIdNames[idx];
- if ( IsUsingUniversalWidgets() )
+ if ( usingUniversal )
ret += wxT("/wxUniversal");
return ret;
}
-wxString wxPlatformInfo::GetPortIdShortName(wxPortId port)
+wxString wxPlatformInfo::GetPortIdShortName(wxPortId port, bool usingUniversal)
{
- const int idx = wxGetIndexFromEnumValue(port);
+ const unsigned idx = wxGetIndexFromEnumValue(port);
wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
_T("invalid port id") );
wxString ret = wxPortIdNames[idx];
ret = ret.Mid(2).Lower(); // remove 'wx' prefix
- if ( IsUsingUniversalWidgets() )
+ if ( usingUniversal )
ret += wxT("univ");
return ret;
{
for ( size_t i = 0; i < WXSIZEOF(wxOperatingSystemIdNames); i++ )
{
- if ( wxOperatingSystemIdNames[i].CmpNoCase(str) == 0 )
+ if ( wxString(wxOperatingSystemIdNames[i]).CmpNoCase(str) == 0 )
return (wxOperatingSystemId)(1 << i);
}
{
wxPortId current = (wxPortId)(1 << i);
- if ( wxPortIdNames[i].CmpNoCase(str) == 0 )
- return current;
- if ( GetPortIdShortName(current).CmpNoCase(str) == 0 )
+ if ( wxString(wxPortIdNames[i]).CmpNoCase(str) == 0 ||
+ GetPortIdShortName(current, true).CmpNoCase(str) == 0 ||
+ GetPortIdShortName(current, false).CmpNoCase(str) == 0 )
return current;
}
wxEndianness wxPlatformInfo::GetEndianness(const wxString& end)
{
- wxString endl(end.Lower());
- if ( end.StartsWith(wxT("little")) )
+ const wxString endl(end.Lower());
+ if ( endl.StartsWith(wxT("little")) )
return wxENDIAN_LITTLE;
- if ( end.StartsWith(wxT("big")) )
+ if ( endl.StartsWith(wxT("big")) )
return wxENDIAN_BIG;
return wxENDIAN_INVALID;
projects / wxWidgets.git / blobdiff