fix another logical/physical coords confusion and update the comment to help with...

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

diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index 2065e01a7fc9f452c08788ea0b3a0dbe1c8c7504..2a4e8621cfaa7d4160d0f3a9c6dc83e64869695b 100644 (file)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -58,7 +58,11 @@ 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_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
 };
 
 // list of wxWidgets ports - some of them can be used with more than
@@ -76,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_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
@@ -130,6 +135,11 @@ public:
     bool operator!=(const wxPlatformInfo &t) const
         { return !(*this == t); }
 
+    // Gets a wxPlatformInfo already initialized with the values for
+    // the currently running platform.
+    static const wxPlatformInfo& Get();
+
+
 
     // string -> enum conversions
     // ---------------------------------
@@ -246,6 +256,9 @@ protected:
         return majorCur > major || (majorCur == major && minorCur >= minor);
     }
 
+    void InitForCurrentPlatform();
+
+
     // OS stuff
     // -----------------