X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af0ac990fc6a8fabdb1255152dc027a91972d8a3..2e8c12bcb028f4b3a77e71e7bcc91fc8f156feaa:/interface/wx/xrc/xmlres.h?ds=inline diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h index a906d188c6..28709171bc 100644 --- a/interface/wx/xrc/xmlres.h +++ b/interface/wx/xrc/xmlres.h @@ -3,7 +3,7 @@ // Purpose: interface of wxXmlResource // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -175,7 +175,12 @@ public: If @a value_if_not_found is @c wxID_NONE, the number is obtained via wxNewId(). Otherwise @a value_if_not_found is used. + Macro @c XRCID(name) is provided for convenient use in event tables. + + @note IDs returned by XRCID() cannot be used with the EVT_*_RANGE + macros, because the order in which they are assigned to symbolic @a name + values is not guaranteed. */ static int GetXRCID(const wxString& str_id, int value_if_not_found = wxID_NONE); @@ -383,7 +388,7 @@ protected: @see wxXmlResourceHandler::ReportError(), DoReportError() */ - void ReportError(wxXmlNode *context, const wxString& message); + void ReportError(const wxXmlNode *context, const wxString& message); /** Implementation of XRC resources errors reporting. @@ -411,7 +416,7 @@ protected: @see ReportError() */ - virtual void DoReportError(const wxString& xrcFile, wxXmlNode *position, + virtual void DoReportError(const wxString& xrcFile, const wxXmlNode *position, const wxString& message); }; @@ -548,6 +553,18 @@ protected: wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0, wxWindow* windowToUse = 0); + /** + Gets a direction. + + If the given @a param is not present or has empty value, @a dir is + returned by default. Otherwise the value of the parameter is parsed and + a warning is generated if it's not one of @c wxLEFT, @c wxTOP, @c + wxRIGHT or @c wxBOTTOM. + + @since 2.9.3 + */ + wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT); + /** Gets a font. */