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

Changed the wxPlatform syntax as per Vadim's suggestions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-04-16 09:31:06 +00:00
parent e4861c72be
commit 4bfec1790f
3 changed files with 103 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/common/utilscmn.cpp
View File

@@ -309,61 +309,116 @@ int wxGetOsVersion(int *verMaj, int *verMin)
wxArrayInt* wxPlatform::sm_customPlatforms = NULL;
wxPlatform& wxPlatform::Is(int platform, long value)
void wxPlatform::Copy(const wxPlatform& platform)
{
if (wxPlatformIs(platform))
m_longValue = platform.m_longValue;
m_doubleValue = platform.m_doubleValue;
m_stringValue = platform.m_stringValue;
}
wxPlatform wxPlatform::If(int platform, long value)
{
if (Is(platform))
return wxPlatform(value);
else
return wxPlatform();
}
wxPlatform wxPlatform::IfNot(int platform, long value)
{
if (!Is(platform))
return wxPlatform(value);
else
return wxPlatform();
}
wxPlatform& wxPlatform::ElseIf(int platform, long value)
{
if (Is(platform))
m_longValue = value;
return *this;
}
wxPlatform& wxPlatform::IsNot(int platform, long value)
wxPlatform& wxPlatform::ElseIfNot(int platform, long value)
{
if (!wxPlatformIs(platform))
if (!Is(platform))
m_longValue = value;
return *this;
}
wxPlatform& wxPlatform::Is(int platform, double value)
wxPlatform wxPlatform::If(int platform, double value)
{
if (wxPlatformIs(platform))
if (Is(platform))
return wxPlatform(value);
else
return wxPlatform();
}
wxPlatform wxPlatform::IfNot(int platform, double value)
{
if (!Is(platform))
return wxPlatform(value);
else
return wxPlatform();
}
wxPlatform& wxPlatform::ElseIf(int platform, double value)
{
if (Is(platform))
m_doubleValue = value;
return *this;
}
wxPlatform& wxPlatform::IsNot(int platform, double value)
wxPlatform& wxPlatform::ElseIfNot(int platform, double value)
{
if (!wxPlatformIs(platform))
if (!Is(platform))
m_doubleValue = value;
return *this;
}
wxPlatform& wxPlatform::Is(int platform, const wxString& value)
wxPlatform wxPlatform::If(int platform, const wxString& value)
{
if (wxPlatformIs(platform))
if (Is(platform))
return wxPlatform(value);
else
return wxPlatform();
}
wxPlatform wxPlatform::IfNot(int platform, const wxString& value)
{
if (!Is(platform))
return wxPlatform(value);
else
return wxPlatform();
}
wxPlatform& wxPlatform::ElseIf(int platform, const wxString& value)
{
if (Is(platform))
m_stringValue = value;
return *this;
}
wxPlatform& wxPlatform::IsNot(int platform, const wxString& value)
wxPlatform& wxPlatform::ElseIfNot(int platform, const wxString& value)
{
if (!wxPlatformIs(platform))
if (!Is(platform))
m_stringValue = value;
return *this;
}
wxPlatform& wxPlatform::Default(long value)
wxPlatform& wxPlatform::Else(long value)
{
m_longValue = value;
return *this;
}
wxPlatform& wxPlatform::Default(double value)
wxPlatform& wxPlatform::Else(double value)
{
m_doubleValue = value;
return *this;
}
wxPlatform& wxPlatform::Default(const wxString& value)
wxPlatform& wxPlatform::Else(const wxString& value)
{
m_stringValue = value;
return *this;
@@ -384,7 +439,7 @@ void wxPlatform::ClearPlatforms()
/// Function for testing current platform
bool wxPlatform::PlatformIs(int platform)
bool wxPlatform::Is(int platform)
{
#ifdef __WXMSW__
if (platform == wxMSW)