X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38b97c15acf982020caf8291c2ccc0b0a36eceab..4ed51f4d1c02f01489df35b25a96a1d5b25c1478:/wxPython/src/_xmlres.i?ds=sidebyside diff --git a/wxPython/src/_xmlres.i b/wxPython/src/_xmlres.i index cc8ac270c7..ba07720eea 100644 --- a/wxPython/src/_xmlres.i +++ b/wxPython/src/_xmlres.i @@ -45,8 +45,10 @@ class wxXmlResource : public wxObject { public: - %pythonAppend wxXmlResource(const wxString& filemask, int flags) "self.InitAllHandlers()" - %pythonAppend wxXmlResource(int flags) "val.InitAllHandlers()" + %pythonAppend wxXmlResource(const wxString& filemask, int flags, + const wxString& domain=wxEmptyString) "self.InitAllHandlers()" + %pythonAppend wxXmlResource(int flags, + const wxString& domain=wxEmptyString) "val.InitAllHandlers()" // Ctors. // Flags: wxXRC_USE_LOCALE @@ -54,11 +56,15 @@ public: // wxXRC_NO_SUBCLASSING // subclass property of object nodes will be ignored // (useful for previews in XRC editors) - wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); - %name(EmptyXmlResource) wxXmlResource(int flags = wxXRC_USE_LOCALE); + wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE, + const wxString& domain=wxEmptyString); + %RenameCtor(EmptyXmlResource, wxXmlResource(int flags = wxXRC_USE_LOCALE, + const wxString& domain=wxEmptyString)); + ~wxXmlResource(); - + //wxXmlNode* GetFirstRoot(); ** Link error + // Loads resources from XML files that match given filemask. // This method understands VFS (see filesys.h). bool Load(const wxString& filemask); @@ -91,9 +97,15 @@ public: } } + // Unload resource from the given XML file (wildcards not allowed) + bool Unload(const wxString& filename); + // Initialize handlers for all supported controls/windows. void InitAllHandlers(); + + %disownarg( wxPyXmlResourceHandler *handler ); + // Initialize only specific handler (or custom handler). Convention says // that handler name is equal to control's name plus 'XmlHandler', e.g. // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. XML resource compiler @@ -104,6 +116,9 @@ public: // Add a new handler at the begining of the handler list void InsertHandler(wxPyXmlResourceHandler *handler); + %cleardisown( wxPyXmlResourceHandler *handler ); + + // Removes all handlers void ClearHandlers(); @@ -118,7 +133,7 @@ public: // Loads menubar from resource. Returns NULL on failure. wxMenuBar *LoadMenuBar(const wxString& name); - %name(LoadMenuBarOnFrame) wxMenuBar *LoadMenuBar(wxWindow *parent, const wxString& name); + %Rename(LoadMenuBarOnFrame, wxMenuBar* , LoadMenuBar(wxWindow *parent, const wxString& name)); // Loads toolbar @@ -132,16 +147,16 @@ public: // wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog"); // dlg->ShowModal(); wxDialog *LoadDialog(wxWindow *parent, const wxString& name); - %name(LoadOnDialog)bool LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name); + %Rename(LoadOnDialog, bool, LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)); // Loads panel. panel points to parent window (if any). Second form // is used to finish creation of already existing instance. wxPanel *LoadPanel(wxWindow *parent, const wxString& name); - %name(LoadOnPanel)bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name); + %Rename(LoadOnPanel, bool, LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name)); // Load a frame's contents from a resource wxFrame *LoadFrame(wxWindow* parent, const wxString& name); - %name(LoadOnFrame)bool LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name); + %Rename(LoadOnFrame, bool, LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name)); // Load an object from the resource specifying both the resource name and // the classname. This lets you load nonstandard container windows. @@ -151,8 +166,8 @@ public: // Load an object from the resource specifying both the resource name and // the classname. This form lets you finish the creation of an existing // instance. - %name(LoadOnObject)bool LoadObject(wxObject *instance, wxWindow *parent, const wxString& name, - const wxString& classname); + %Rename(LoadOnObject, bool, LoadObject(wxObject *instance, wxWindow *parent, const wxString& name, + const wxString& classname)); // Loads a bitmap resource from a file. wxBitmap LoadBitmap(const wxString& name); @@ -165,10 +180,13 @@ public: bool AttachUnknownControl(const wxString& name, wxWindow *control, wxWindow *parent = NULL); - // Returns numeric ID that is equivalent to string id used in XML - // resource. To be used in event tables - // Macro XMLID is provided for convenience - static int GetXRCID(const wxString& str_id); + // Returns a numeric ID that is equivalent to the string ID used in an XML + // resource. If an unknown str_id is requested (i.e. other than wxID_XXX + // or integer), a new record is created which associates the given string + // with a number. If value_if_not_found == wxID_NONE, the number is obtained via + // wxNewId(). Otherwise value_if_not_found is used. + // Macro XRCID(name) is provided for convenient use in event tables. + static int GetXRCID(const wxString& str_id, int value_if_not_found = wxID_NONE); // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a) long GetVersion() const; @@ -189,13 +207,20 @@ public: // Set flags after construction. void SetFlags(int flags) { m_flags = flags; } + // Get/Set the domain to be passed to the translation functions, defaults to NULL. + wxString GetDomain() const; + void SetDomain(const wxString& domain); + + %property(Domain, GetDomain, SetDomain, doc="See `GetDomain` and `SetDomain`"); + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Version, GetVersion, doc="See `GetVersion`"); }; //---------------------------------------------------------------------- %pythoncode { -def XRCID(str_id): - return XmlResource_GetXRCID(str_id) +def XRCID(str_id, value_if_not_found = wx.ID_NONE): + return XmlResource_GetXRCID(str_id, value_if_not_found) def XRCCTRL(window, str_id, *ignoreargs): return window.FindWindowById(XRCID(str_id))