From: Robin Dunn Date: Wed, 26 Oct 2011 05:52:53 +0000 (+0000) Subject: Interface tweaks and fixes for Phoenix X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5e0e1372fdbb5e9325cadc8be2f69ae0e849a9cc Interface tweaks and fixes for Phoenix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/interface/wx/platinfo.h b/interface/wx/platinfo.h index 520f09ff45..2cb33260a7 100644 --- a/interface/wx/platinfo.h +++ b/interface/wx/platinfo.h @@ -181,7 +181,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, diff --git a/interface/wx/process.h b/interface/wx/process.h index 7d62189291..80117f40ff 100644 --- a/interface/wx/process.h +++ b/interface/wx/process.h @@ -321,3 +321,6 @@ public: int GetPid(); }; + +wxEventType wxEVT_END_PROCESS; + diff --git a/interface/wx/radiobox.h b/interface/wx/radiobox.h index 7122504010..05ce753ce4 100644 --- a/interface/wx/radiobox.h +++ b/interface/wx/radiobox.h @@ -326,4 +326,13 @@ public: */ virtual bool Show(unsigned int item, bool show = true); + + + // pure virtuals that have implementations here + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& string); + virtual void SetSelection(int n); + virtual int GetSelection() const; + };