Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index cb2de2f3fdc0f777946a93a163fe319dd2d4f79e..39a5099be0d7070c8f57f06ffb6a5c8d180b0d3f 100644 (file)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -6,7 +6,7 @@
 // Created:     07.07.2006 (based on wxToolkitInfo)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Francesco Montorsi
-// License:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PLATINFO_H_
@@ -58,11 +58,7 @@ enum wxOperatingSystemId
     // 1<<13 and 1<<14 available for other Unix flavours
 
     wxOS_DOS            = 1 << 15,      // Microsoft DOS
-    wxOS_OS2            = 1 << 16,       // OS/2
-
-    wxOS_PALM_OS        = 1 << 17,       // Pure Palm OS
-    wxOS_PALM_LINUX     = 1 << 18,       // Palm over linux
-    wxOS_PALM = wxOS_PALM_OS | wxOS_PALM_LINUX
+    wxOS_OS2            = 1 << 16       // OS/2
 };
 
 // list of wxWidgets ports - some of them can be used with more than
@@ -76,16 +72,14 @@ enum wxPortId
     wxPORT_MSW      = 1 << 1,       // wxMSW, native toolkit is Windows API
     wxPORT_MOTIF    = 1 << 2,       // wxMotif, using [Open]Motif or Lesstif
     wxPORT_GTK      = 1 << 3,       // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
-    wxPORT_MGL      = 1 << 4,       // wxMGL, using wxUniversal
+    wxPORT_DFB      = 1 << 4,       // wxDFB, using wxUniversal
     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,       // 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_DFB      = 1 << 11       // wxDFB, using wxUniversal
+    wxPORT_WINCE    = 1 << 9        // wxWinCE, toolkit is WinCE SDK API
 };
 
 // architecture of the operating system
@@ -121,15 +115,15 @@ struct wxLinuxDistributionInfo
     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); }
 };
@@ -186,7 +180,7 @@ public:
     static wxString GetArchName(wxArchitecture arch);
     static wxString GetEndiannessName(wxEndianness end);
 
-    
+
     // getters
     // -----------------
 
@@ -251,11 +245,11 @@ public:
         { 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 
+        // 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
@@ -276,7 +270,7 @@ public:
         { m_arch = n; }
     void SetEndianness(wxEndianness n)
         { m_endian = n; }
-        
+
     void SetDesktopEnvironment(const wxString& de)
         { m_desktopEnv = de; }
     void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di)
@@ -293,9 +287,9 @@ public:
                !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;
-               
+
                // do not check linux-specific info; it's ok to have them empty
     }
 
@@ -319,14 +313,14 @@ protected:
 
     // Operating system ID.
     wxOperatingSystemId m_os;
-    
+
     // Operating system description.
     wxString m_osDesc;
-    
-    
+
+
     // linux-specific
     // -----------------
-    
+
     wxString m_desktopEnv;
     wxLinuxDistributionInfo m_ldi;
 
@@ -366,9 +360,7 @@ protected:
     #define wxWinCE                 wxOS_WINDOWS_CE
     #define wxWIN32S                wxOS_WINDOWS_9X
 
-    #define wxPalmOS                wxPORT_PALMOS
     #define wxOS2                   wxPORT_OS2
-    #define wxMGL                   wxPORT_MGL
     #define wxCocoa                 wxPORT_MAC
     #define wxMac                   wxPORT_MAC
     #define wxMotif                 wxPORT_MOTIF