Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."

[wxWidgets.git] / include / wx / platinfo.h

diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index cb2de2f3fdc0f777946a93a163fe319dd2d4f79e..cca996b27f41bea5f09d0febd597bdf74b66f66e 100644 (file)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -121,15 +121,15 @@ struct wxLinuxDistributionInfo
     wxString Release;
     wxString CodeName;
     wxString Description;
     wxString Release;
     wxString CodeName;
     wxString Description;

-    
+

     bool operator==(const wxLinuxDistributionInfo& ldi) const
     bool operator==(const wxLinuxDistributionInfo& ldi) const

-    { 
+    {

         return Id == ldi.Id &&
                Release == ldi.Release &&
                CodeName == ldi.CodeName &&
                Description == ldi.Description;
     }
         return Id == ldi.Id &&
                Release == ldi.Release &&
                CodeName == ldi.CodeName &&
                Description == ldi.Description;
     }

-    
+

     bool operator!=(const wxLinuxDistributionInfo& ldi) const
     { return !(*this == ldi); }
 };
     bool operator!=(const wxLinuxDistributionInfo& ldi) const
     { return !(*this == ldi); }
 };


@@ -186,7 +186,7 @@ public:
     static wxString GetArchName(wxArchitecture arch);
     static wxString GetEndiannessName(wxEndianness end);
 
     static wxString GetArchName(wxArchitecture arch);
     static wxString GetEndiannessName(wxEndianness end);
 

-    
+

     // getters
     // -----------------
 
     // getters
     // -----------------
 


@@ -251,11 +251,11 @@ public:
         { return m_osDesc; }
     wxString GetDesktopEnvironment() const
         { return m_desktopEnv; }
         { return m_osDesc; }
     wxString GetDesktopEnvironment() const
         { return m_desktopEnv; }

-        
+

     static wxString GetOperatingSystemDirectory();
         // doesn't make sense to store inside wxPlatformInfo the OS directory,
         // thus this function is static; note that this function simply calls
     static wxString GetOperatingSystemDirectory();
         // doesn't make sense to store inside wxPlatformInfo the OS directory,
         // thus this function is static; note that this function simply calls

-        // wxGetOSDirectory() and is here just to make it easier for the user to 
+        // wxGetOSDirectory() and is here just to make it easier for the user to

         // find it that feature (global functions can be difficult to find in the docs)
 
     // setters
         // find it that feature (global functions can be difficult to find in the docs)
 
     // setters


@@ -276,7 +276,7 @@ public:
         { m_arch = n; }
     void SetEndianness(wxEndianness n)
         { m_endian = n; }
         { m_arch = n; }
     void SetEndianness(wxEndianness n)
         { m_endian = n; }

-        
+

     void SetDesktopEnvironment(const wxString& de)
         { m_desktopEnv = de; }
     void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di)
     void SetDesktopEnvironment(const wxString& de)
         { m_desktopEnv = de; }
     void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di)


@@ -293,9 +293,9 @@ public:
                !m_osDesc.IsEmpty() &&
                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&
                !m_osDesc.IsEmpty() &&
                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&

-               m_arch != wxARCH_INVALID && 
+               m_arch != wxARCH_INVALID &&

                m_endian != wxENDIAN_INVALID;
                m_endian != wxENDIAN_INVALID;

-               
+

                // do not check linux-specific info; it's ok to have them empty
     }
 
                // do not check linux-specific info; it's ok to have them empty
     }
 


@@ -319,14 +319,14 @@ protected:
 
     // Operating system ID.
     wxOperatingSystemId m_os;
 
     // Operating system ID.
     wxOperatingSystemId m_os;

-    
+

     // Operating system description.
     wxString m_osDesc;
     // Operating system description.
     wxString m_osDesc;

-    
-    
+
+

     // linux-specific
     // -----------------
     // linux-specific
     // -----------------

-    
+

     wxString m_desktopEnv;
     wxLinuxDistributionInfo m_ldi;
 
     wxString m_desktopEnv;
     wxLinuxDistributionInfo m_ldi;