Add various selection menu items to the sample.

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

diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp
index a687a47862f4f96f45282ed860bf952d8ad5edc6..3b21f617c255f951d302510fdd3c003b23e633f4 100644 (file)
--- a/src/common/platinfo.cpp
+++ b/src/common/platinfo.cpp
@@ -6,7 +6,7 @@
 // Created:     07.07.2006 (based on wxToolkitInfo)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Francesco Montorsi
 // Created:     07.07.2006 (based on wxToolkitInfo)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Francesco Montorsi

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -45,60 +45,60 @@ static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN);
 
 static const wxChar* const wxOperatingSystemIdNames[] =
 {
 
 static const wxChar* const wxOperatingSystemIdNames[] =
 {

-    _T("Apple Mac OS"),
-    _T("Apple Mac OS X"),
+    wxT("Apple Mac OS"),
+    wxT("Apple Mac OS X"),

 
 

-    _T("Microsoft Windows 9X"),
-    _T("Microsoft Windows NT"),
-    _T("Microsoft Windows Micro"),
-    _T("Microsoft Windows CE"),
+    wxT("Microsoft Windows 9X"),
+    wxT("Microsoft Windows NT"),
+    wxT("Microsoft Windows Micro"),
+    wxT("Microsoft Windows CE"),

 
 

-    _T("Linux"),
-    _T("FreeBSD"),
-    _T("OpenBSD"),
-    _T("NetBSD"),
+    wxT("Linux"),
+    wxT("FreeBSD"),
+    wxT("OpenBSD"),
+    wxT("NetBSD"),

 
 

-    _T("SunOS"),
-    _T("AIX"),
-    _T("HPUX"),
+    wxT("SunOS"),
+    wxT("AIX"),
+    wxT("HPUX"),

 
 

-    _T("Other Unix"),
-    _T("Other Unix"),
+    wxT("Other Unix"),
+    wxT("Other Unix"),

 
 

-    _T("DOS"),
-    _T("OS/2"),
+    wxT("DOS"),
+    wxT("OS/2"),

 
 

-    _T("PalmOS"),
-    _T("PalmOS(Over Linux)"),
+    wxT("PalmOS"),
+    wxT("PalmOS(Over Linux)"),

 };
 
 static const wxChar* const wxPortIdNames[] =
 {
 };
 
 static const wxChar* const wxPortIdNames[] =
 {

-    _T("wxBase"),
-    _T("wxMSW"),
-    _T("wxMotif"),
-    _T("wxGTK"),
-    _T("wxMGL"),
-    _T("wxX11"),
-    _T("wxOS2"),
-    _T("wxMac"),
-    _T("wxCocoa"),
-    _T("wxWinCE"),
-    _T("wxPalmOS"),
-    _T("wxDFB")
+    wxT("wxBase"),
+    wxT("wxMSW"),
+    wxT("wxMotif"),
+    wxT("wxGTK"),
+    wxT("wxMGL"),
+    wxT("wxX11"),
+    wxT("wxOS2"),
+    wxT("wxMac"),
+    wxT("wxCocoa"),
+    wxT("wxWinCE"),
+    wxT("wxPalmOS"),
+    wxT("wxDFB")

 };
 
 static const wxChar* const wxArchitectureNames[] =
 {
 };
 
 static const wxChar* const wxArchitectureNames[] =
 {

-    _T("32 bit"),
-    _T("64 bit")
+    wxT("32 bit"),
+    wxT("64 bit")

 };
 
 static const wxChar* const wxEndiannessNames[] =
 {
 };
 
 static const wxChar* const wxEndiannessNames[] =
 {

-    _T("Big endian"),
-    _T("Little endian"),
-    _T("PDP endian")
+    wxT("Big endian"),
+    wxT("Little endian"),
+    wxT("PDP endian")

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -109,7 +109,7 @@ static const wxChar* const wxEndiannessNames[] =
 // corresponding indexes of the string arrays above
 static unsigned wxGetIndexFromEnumValue(int value)
 {
 // corresponding indexes of the string arrays above
 static unsigned wxGetIndexFromEnumValue(int value)
 {

-    wxCHECK_MSG( value, (unsigned)-1, _T("invalid enum value") );
+    wxCHECK_MSG( value, (unsigned)-1, wxT("invalid enum value") );

 
     int n = 0;
     while ( !(value & 1) )
 
     int n = 0;
     while ( !(value & 1) )


@@ -118,7 +118,7 @@ static unsigned wxGetIndexFromEnumValue(int value)
         n++;
     }
 
         n++;
     }
 

-    wxASSERT_MSG( value == 1, _T("more than one bit set in enum value") );
+    wxASSERT_MSG( value == 1, wxT("more than one bit set in enum value") );

 
     return n;
 }
 
     return n;
 }


@@ -174,7 +174,7 @@ void wxPlatformInfo::InitForCurrentPlatform()
     const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
     if ( !traits )
     {
     const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
     if ( !traits )
     {

-        wxFAIL_MSG( _T("failed to initialize wxPlatformInfo") );
+        wxFAIL_MSG( wxT("failed to initialize wxPlatformInfo") );

 
         m_port = wxPORT_UNKNOWN;
         m_usingUniversal = false;
 
         m_port = wxPORT_UNKNOWN;
         m_usingUniversal = false;


@@ -192,7 +192,7 @@ void wxPlatformInfo::InitForCurrentPlatform()
     m_osDesc = wxGetOsDescription();
     m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
     m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;
     m_osDesc = wxGetOsDescription();
     m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
     m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;

-    
+

 #ifdef __LINUX__
     m_ldi = wxGetLinuxDistributionInfo();
 #endif
 #ifdef __LINUX__
     m_ldi = wxGetLinuxDistributionInfo();
 #endif


@@ -226,17 +226,17 @@ wxString wxPlatformInfo::GetOperatingSystemDirectory()
 
 wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
 {
 
 wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
 {

-    const wxChar* string = _T("Unknown");
+    const wxChar* string = wxT("Unknown");

     if ( os & wxOS_MAC )
     if ( os & wxOS_MAC )

-        string = _T("Macintosh");
+        string = wxT("Macintosh");

     else if ( os & wxOS_WINDOWS )
     else if ( os & wxOS_WINDOWS )

-        string = _T("Windows");
+        string = wxT("Windows");

     else if ( os & wxOS_UNIX )
     else if ( os & wxOS_UNIX )

-        string = _T("Unix");
+        string = wxT("Unix");

     else if ( os == wxOS_DOS )
     else if ( os == wxOS_DOS )

-        string = _T("DOS");
+        string = wxT("DOS");

     else if ( os == wxOS_OS2 )
     else if ( os == wxOS_OS2 )

-        string = _T("OS/2");
+        string = wxT("OS/2");

 
     return string;
 }
 
     return string;
 }


@@ -246,7 +246,7 @@ wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os)
     const unsigned idx = wxGetIndexFromEnumValue(os);
 
     wxCHECK_MSG( idx < WXSIZEOF(wxOperatingSystemIdNames), wxEmptyString,
     const unsigned idx = wxGetIndexFromEnumValue(os);
 
     wxCHECK_MSG( idx < WXSIZEOF(wxOperatingSystemIdNames), wxEmptyString,

-                 _T("invalid OS id") );
+                 wxT("invalid OS id") );

 
     return wxOperatingSystemIdNames[idx];
 }
 
     return wxOperatingSystemIdNames[idx];
 }


@@ -256,7 +256,7 @@ wxString wxPlatformInfo::GetPortIdName(wxPortId port, bool usingUniversal)
     const unsigned idx = wxGetIndexFromEnumValue(port);
 
     wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
     const unsigned idx = wxGetIndexFromEnumValue(port);
 
     wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,

-                 _T("invalid port id") );
+                 wxT("invalid port id") );

 
     wxString ret = wxPortIdNames[idx];
 
 
     wxString ret = wxPortIdNames[idx];
 


@@ -271,7 +271,7 @@ wxString wxPlatformInfo::GetPortIdShortName(wxPortId port, bool usingUniversal)
     const unsigned idx = wxGetIndexFromEnumValue(port);
 
     wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
     const unsigned idx = wxGetIndexFromEnumValue(port);
 
     wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,

-                 _T("invalid port id") );
+                 wxT("invalid port id") );

 
     wxString ret = wxPortIdNames[idx];
     ret = ret.Mid(2).Lower();       // remove 'wx' prefix
 
     wxString ret = wxPortIdNames[idx];
     ret = ret.Mid(2).Lower();       // remove 'wx' prefix