detect and report errors in XRC specification of grid sizers

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

diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index ad01a08b62253dab97930cc427bbb53bccf782da..2a4e8621cfaa7d4160d0f3a9c6dc83e64869695b 100644 (file)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -62,7 +62,7 @@ enum wxOperatingSystemId
 
     wxOS_PALM_OS        = 1 << 17,       // Pure Palm OS
     wxOS_PALM_LINUX     = 1 << 18,       // Palm over linux
 
     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_PALM = wxOS_PALM_OS | wxOS_PALM_LINUX

 };
 
 // list of wxWidgets ports - some of them can be used with more than
 };
 
 // list of wxWidgets ports - some of them can be used with more than


@@ -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