renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing

[wxWidgets.git] / src / common / platinfo.cpp

diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp
index 998d0e964e4f81a8736a55aa5c38db61bbe0571c..df765b153a79596f36726ad2d76826f0a5e87f15 100644 (file)
--- a/src/common/platinfo.cpp
+++ b/src/common/platinfo.cpp
@@ -24,18 +24,20 @@
     #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"
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-static wxString wxOperatingSystemIdNames[] =
+static const wxChar* const wxOperatingSystemIdNames[] =
 {
     _T("Apple Mac OS"),
     _T("Apple Mac OS X"),
@@ -58,7 +60,7 @@ static wxString wxOperatingSystemIdNames[] =
     _T("OS/2")
 };
 
-static wxString wxPortIdNames[] =
+static const wxChar* const wxPortIdNames[] =
 {
     _T("wxBase"),
     _T("wxMSW"),
@@ -70,16 +72,17 @@ static wxString wxPortIdNames[] =
     _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"),
@@ -92,9 +95,9 @@ static wxString wxEndiannessNames[] =
 
 // 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) )
@@ -121,12 +124,14 @@ wxPlatformInfo::wxPlatformInfo()
         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);
@@ -137,11 +142,13 @@ wxPlatformInfo::wxPlatformInfo()
 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;
@@ -159,6 +166,7 @@ bool wxPlatformInfo::operator==(const wxPlatformInfo &t) const
            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;
 }
@@ -169,23 +177,24 @@ bool wxPlatformInfo::operator==(const wxPlatformInfo &t) const
 
 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") );
@@ -193,24 +202,24 @@ wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os)
     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") );
@@ -218,7 +227,7 @@ wxString wxPlatformInfo::GetPortIdShortName(wxPortId port)
     wxString ret = wxPortIdNames[idx];
     ret = ret.Mid(2).Lower();       // remove 'wx' prefix
 
-    if ( IsUsingUniversalWidgets() )
+    if ( usingUniversal )
         ret += wxT("univ");
 
     return ret;
@@ -249,7 +258,7 @@ wxOperatingSystemId wxPlatformInfo::GetOperatingSystemId(const wxString &str)
 {
     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);
     }
 
@@ -263,9 +272,9 @@ wxPortId wxPlatformInfo::GetPortId(const wxString &str)
     {
         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;
     }