GetBestFittingSize --> GetEffectiveMinSize

[wxWidgets.git] / wxPython / src / _xmlres.i

diff --git a/wxPython/src/_xmlres.i b/wxPython/src/_xmlres.i
index d313e342ec332b543331a673fe101a306f7ccc9b..ba07720eea38b725a5578869f8a96ea121c55118 100644 (file)
--- 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);
-    %RenameCtor(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);
@@ -97,6 +103,9 @@ public:
     // 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
@@ -107,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();
 
@@ -195,6 +207,13 @@ 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`");
 };
 
 //----------------------------------------------------------------------