X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2025b311a0172fbd9b993c6cffce11cffcc35f3..92c0fc34c104c8d7c12d6a3b78ea232690fc23f4:/interface/wx/platinfo.h?ds=sidebyside diff --git a/interface/wx/platinfo.h b/interface/wx/platinfo.h index 36454b79be..711ab9bd05 100644 --- a/interface/wx/platinfo.h +++ b/interface/wx/platinfo.h @@ -2,7 +2,6 @@ // Name: platinfo.h // Purpose: interface of wxPlatformInfo // Author: wxWidgets team -// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -77,14 +76,12 @@ 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_OS2 = 1 << 6, //!< wxOS2, using OS/2 Presentation Manager wxPORT_MAC = 1 << 7, //!< wxMac, using Carbon or Classic Mac 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 }; @@ -163,7 +160,7 @@ struct wxLinuxDistributionInfo @see ::wxGetOsVersion(), wxIsPlatformLittleEndian(), wxIsPlatform64Bit(), wxAppTraits, @ref group_funcmacro_networkuseros */ -class wxPlatformInfo : public wxObject +class wxPlatformInfo { public: @@ -181,7 +178,7 @@ public: /** Initializes the object using given values. */ - wxPlatformInfo(wxPortId pid = wxPORT_UNKNOWN, + wxPlatformInfo(wxPortId pid, int tkMajor = -1, int tkMinor = -1, wxOperatingSystemId id = wxOS_UNKNOWN,