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 e639d599e7244ee64c6448b33c9142e34f3c5f7a..cca996b27f41bea5f09d0febd597bdf74b66f66e 100644 (file)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -15,7 +15,7 @@
 #include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/string.h"
 
 // ----------------------------------------------------------------------------

-// wxPlatformInfo
+// wxPlatformInfo enums & structs

 // ----------------------------------------------------------------------------
 
 // VERY IMPORTANT: when changing these enum values, also change the relative
 // ----------------------------------------------------------------------------
 
 // VERY IMPORTANT: when changing these enum values, also change the relative


@@ -80,7 +80,8 @@ enum wxPortId
     wxPORT_X11      = 1 << 5,       // wxX11, using wxUniversal
     wxPORT_PM       = 1 << 6,       // wxOS2, using OS/2 Presentation Manager
     wxPORT_OS2      = wxPORT_PM,    // wxOS2, using OS/2 Presentation Manager
     wxPORT_X11      = 1 << 5,       // wxX11, using wxUniversal
     wxPORT_PM       = 1 << 6,       // wxOS2, using OS/2 Presentation Manager
     wxPORT_OS2      = wxPORT_PM,    // wxOS2, using OS/2 Presentation Manager

-    wxPORT_MAC      = 1 << 7,       // wxMac, using Carbon or Classic Mac API
+    wxPORT_MAC      = 1 << 7,       // wxOSX (former wxMac), using Cocoa, Carbon or iPhone API
+    wxPORT_OSX      = wxPORT_MAC,   // wxOSX, using Cocoa, Carbon or iPhone API

     wxPORT_COCOA    = 1 << 8,       // wxCocoa, using Cocoa NextStep/Mac API
     wxPORT_WINCE    = 1 << 9,       // wxWinCE, toolkit is WinCE SDK API
     wxPORT_PALMOS   = 1 << 10,      // wxPalmOS, toolkit is PalmOS API
     wxPORT_COCOA    = 1 << 8,       // wxCocoa, using Cocoa NextStep/Mac API
     wxPORT_WINCE    = 1 << 9,       // wxWinCE, toolkit is WinCE SDK API
     wxPORT_PALMOS   = 1 << 10,      // wxPalmOS, toolkit is PalmOS API


@@ -113,6 +114,31 @@ enum wxEndianness
     wxENDIAN_MAX
 };
 
     wxENDIAN_MAX
 };
 

+// informations about a linux distro returned by the lsb_release utility
+struct wxLinuxDistributionInfo
+{
+    wxString Id;
+    wxString Release;
+    wxString CodeName;
+    wxString Description;
+
+    bool operator==(const wxLinuxDistributionInfo& ldi) const
+    {
+        return Id == ldi.Id &&
+               Release == ldi.Release &&
+               CodeName == ldi.CodeName &&
+               Description == ldi.Description;
+    }
+
+    bool operator!=(const wxLinuxDistributionInfo& ldi) const
+    { return !(*this == ldi); }
+};
+
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo
+// ----------------------------------------------------------------------------
+

 // Information about the toolkit that the app is running under and some basic
 // platform and architecture info
 class WXDLLIMPEXP_BASE wxPlatformInfo
 // Information about the toolkit that the app is running under and some basic
 // platform and architecture info
 class WXDLLIMPEXP_BASE wxPlatformInfo


@@ -160,6 +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
     // -----------------
 


@@ -195,6 +222,8 @@ public:
 
     wxOperatingSystemId GetOperatingSystemId() const
         { return m_os; }
 
     wxOperatingSystemId GetOperatingSystemId() const
         { return m_os; }

+    wxLinuxDistributionInfo GetLinuxDistributionInfo() const
+        { return m_ldi; }

     wxPortId GetPortId() const
         { return m_port; }
     wxArchitecture GetArchitecture() const
     wxPortId GetPortId() const
         { return m_port; }
     wxArchitecture GetArchitecture() const


@@ -218,6 +247,16 @@ public:
         { return GetArchName(m_arch); }
     wxString GetEndiannessName() const
         { return GetEndiannessName(m_endian); }
         { return GetArchName(m_arch); }
     wxString GetEndiannessName() const
         { return GetEndiannessName(m_endian); }

+    wxString GetOperatingSystemDescription() const
+        { 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
+        // 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
     // -----------------
 
     // setters
     // -----------------


@@ -229,6 +268,8 @@ public:
 
     void SetOperatingSystemId(wxOperatingSystemId n)
         { m_os = n; }
 
     void SetOperatingSystemId(wxOperatingSystemId n)
         { m_os = n; }

+    void SetOperatingSystemDescription(const wxString& desc)
+        { m_osDesc = desc; }

     void SetPortId(wxPortId n)
         { m_port = n; }
     void SetArchitecture(wxArchitecture n)
     void SetPortId(wxPortId n)
         { m_port = n; }
     void SetArchitecture(wxArchitecture n)


@@ -236,6 +277,12 @@ public:
     void SetEndianness(wxEndianness n)
         { m_endian = n; }
 
     void SetEndianness(wxEndianness n)
         { m_endian = n; }
 

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

     // miscellaneous
     // -----------------
 
     // miscellaneous
     // -----------------
 


@@ -243,9 +290,13 @@ public:
     {
         return m_osVersionMajor != -1 && m_osVersionMinor != -1 &&
                m_os != wxOS_UNKNOWN &&
     {
         return m_osVersionMajor != -1 && m_osVersionMinor != -1 &&
                m_os != wxOS_UNKNOWN &&

+               !m_osDesc.IsEmpty() &&

                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&
                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&

-               m_arch != wxARCH_INVALID && m_endian != wxENDIAN_INVALID;
+               m_arch != wxARCH_INVALID &&
+               m_endian != wxENDIAN_INVALID;
+
+               // do not check linux-specific info; it's ok to have them empty

     }
 
 
     }
 
 


@@ -269,6 +320,16 @@ protected:
     // Operating system ID.
     wxOperatingSystemId m_os;
 
     // Operating system ID.
     wxOperatingSystemId m_os;
 

+    // Operating system description.
+    wxString m_osDesc;
+
+
+    // linux-specific
+    // -----------------
+
+    wxString m_desktopEnv;
+    wxLinuxDistributionInfo m_ldi;
+

 
     // toolkit
     // -----------------
 
     // toolkit
     // -----------------


@@ -287,7 +348,7 @@ protected:
     // others
     // -----------------
 
     // others
     // -----------------
 

-    // architecture of the OS
+    // architecture of the OS/machine

     wxArchitecture m_arch;
 
     // endianness of the machine
     wxArchitecture m_arch;
 
     // endianness of the machine