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

use wxChar* instead of wxString for string constants, cuts object size by ~1200 bytes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-08-19 22:21:51 +00:00
parent 654ffe9f19
commit 8f4931874c
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/platinfo.cpp
View File

@@ -37,7 +37,7 @@
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static wxString wxOperatingSystemIdNames[] = static const wxChar* const wxOperatingSystemIdNames[] =
{ {
_T("Apple Mac OS"), _T("Apple Mac OS"),
_T("Apple Mac OS X"), _T("Apple Mac OS X"),
@@ -60,7 +60,7 @@ static wxString wxOperatingSystemIdNames[] =
_T("OS/2") _T("OS/2")
}; };
static wxString wxPortIdNames[] = static const wxChar* const wxPortIdNames[] =
{ {
_T("wxBase"), _T("wxBase"),
_T("wxMSW"), _T("wxMSW"),
@@ -75,13 +75,13 @@ static wxString wxPortIdNames[] =
_T("wxPalmOS") _T("wxPalmOS")
}; };
static wxString wxArchitectureNames[] = static const wxChar* const wxArchitectureNames[] =
{ {
_T("32 bit"), _T("32 bit"),
_T("64 bit") _T("64 bit")
}; };
static wxString wxEndiannessNames[] = static const wxChar* const wxEndiannessNames[] =
{ {
_T("Big endian"), _T("Big endian"),
_T("Little endian"), _T("Little endian"),
@@ -176,18 +176,19 @@ bool wxPlatformInfo::operator==(const wxPlatformInfo &t) const
wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os) wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
{ {
const wxChar* string = _T("Unknown");
if ( os & wxOS_MAC ) if ( os & wxOS_MAC )
return _T("Macintosh"); string = _T("Macintosh");
else if ( os & wxOS_WINDOWS ) else if ( os & wxOS_WINDOWS )
return _T("Windows"); string = _T("Windows");
else if ( os & wxOS_UNIX ) else if ( os & wxOS_UNIX )
return _T("Unix"); string = _T("Unix");
else if ( os == wxOS_DOS ) else if ( os == wxOS_DOS )
return _T("DOS"); string = _T("DOS");
else if ( os == wxOS_OS2 ) else if ( os == wxOS_OS2 )
return _T("OS/2"); string = _T("OS/2");
return _T("Unknown"); return string;
} }
wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os) wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os)
@@ -256,7 +257,7 @@ wxOperatingSystemId wxPlatformInfo::GetOperatingSystemId(const wxString &str)
{ {
for ( size_t i = 0; i < WXSIZEOF(wxOperatingSystemIdNames); i++ ) 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); return (wxOperatingSystemId)(1 << i);
} }
@@ -270,9 +271,8 @@ wxPortId wxPlatformInfo::GetPortId(const wxString &str)
{ {
wxPortId current = (wxPortId)(1 << i); wxPortId current = (wxPortId)(1 << i);
if ( wxPortIdNames[i].CmpNoCase(str) == 0 ) if ( wxString(wxPortIdNames[i]).CmpNoCase(str) == 0 ||
return current; GetPortIdShortName(current, true).CmpNoCase(str) == 0 ||
if ( GetPortIdShortName(current, true).CmpNoCase(str) == 0 ||
GetPortIdShortName(current, false).CmpNoCase(str) == 0 ) GetPortIdShortName(current, false).CmpNoCase(str) == 0 )
return current; return current;
} }