X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/230c90774f48fd3ba9a9f1c3af5354fbad94843f..f2408396534cc952a5bfcd3a2cc018abe8221c78:/src/common/utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index b79b0847e1..cf07a0a5c2 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -72,7 +72,6 @@
     #include "wx/colordlg.h"
     #include "wx/fontdlg.h"
     #include "wx/notebook.h"
-    #include "wx/frame.h"
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 
@@ -309,61 +308,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 (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 (wxPlatformIs(platform))
+    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 +438,7 @@ void wxPlatform::ClearPlatforms()
 
 /// Function for testing current platform
 
-bool wxPlatform::PlatformIs(int platform)
+bool wxPlatform::Is(int platform)
 {
 #ifdef __WXMSW__
     if (platform == wxMSW)
@@ -399,7 +453,7 @@ bool wxPlatform::PlatformIs(int platform)
         return true;
 #endif
 #if defined(__WXWINCE__) && defined(__SMARTPHONE__)
-    if (platform == wxWinSmartphone)
+    if (platform == wxWinSmartPhone)
         return true;
 #endif
 #ifdef __WXGTK__
@@ -426,7 +480,7 @@ bool wxPlatform::PlatformIs(int platform)
     if (platform == wxOS2)
         return true;
 #endif
-#ifdef __WXCOCA__
+#ifdef __WXCOCOA__
     if (platform == wxCocoa)
         return true;
 #endif
@@ -764,7 +818,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         {
             ConstStr255Param hint = 0;
             startSel = 0;
-            endSel = url.Length();
+            endSel = url.length();
             err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
             if (err != noErr)
                 wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
@@ -1138,7 +1192,7 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wx
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);
-    if (!caption.IsEmpty())
+    if (!caption.empty())
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {
@@ -1163,7 +1217,7 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxStrin
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);
-    if (!caption.IsEmpty())
+    if (!caption.empty())
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {