use char* instead of wxChar* for XRC IDs to save space; GetXRCID() takes wxString argument

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-15 15:12:51 +00:00
parent 5d88a6b579
commit c560da981a
3 changed files with 13 additions and 9 deletions

View File

@@ -226,7 +226,11 @@ public:
// with a number. If value_if_not_found == wxID_NONE, the number is obtained via
// wxWindow::NewControlId(). Otherwise value_if_not_found is used.
// Macro XRCID(name) is provided for convenient use in event tables.
static int GetXRCID(const wxChar *str_id, int value_if_not_found = wxID_NONE);
static int GetXRCID(const wxString& str_id, int value_if_not_found = wxID_NONE)
{ return DoGetXRCID(str_id.mb_str(), value_if_not_found); }
// version for internal use only
static int DoGetXRCID(const char *str_id, int value_if_not_found = wxID_NONE);
// Returns version information (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a).
long GetVersion() const { return m_version; }
@@ -319,7 +323,7 @@ private:
// END_EVENT_TABLE()
#define XRCID(str_id) \
wxXmlResource::GetXRCID(wxT(str_id))
wxXmlResource::DoGetXRCID(str_id)
// This macro returns pointer to particular control in dialog