Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/animate.h b/interface/wx/animate.h
index f2e549157192cf38a620caff2192dc7fb231588d..77d5ecf423bcd835258ab1810a4ab41d7c1f2953 100644 (file)
--- a/interface/wx/animate.h
+++ b/interface/wx/animate.h
@@ -200,7 +200,7 @@ public:
 
     @see wxAnimationCtrl, @sample{animate}
 */
 
     @see wxAnimationCtrl, @sample{animate}
 */

-class wxAnimation : public wxGDIObject
+class wxAnimation : public wxObject

 {
 public:
     /**
 {
 public:
     /**

diff --git a/interface/wx/xml/xml.h b/interface/wx/xml/xml.h
index 7bb23cd54b668135ff5da493f7413fee412092af..3a7ef80fa45d598e0a46e3c980280badf84579be 100644 (file)
--- a/interface/wx/xml/xml.h
+++ b/interface/wx/xml/xml.h
@@ -434,6 +434,17 @@ public:
 };
 
 
 };
 
 

+//* special indentation value for wxXmlDocument::Save
+#define wxXML_NO_INDENTATION           (-1)
+
+//* flags for wxXmlDocument::Load
+enum wxXmlDocumentLoadFlag
+{
+    wxXMLDOC_NONE,
+    wxXMLDOC_KEEP_WHITESPACE_NODES
+};
+
+

 
 /**
     @class wxXmlDocument
 
 /**
     @class wxXmlDocument

diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 28709171bc7516671675286868b081ea6557d8dd..bd676064a62e9a0552140dfe36bf46e7cb6e0309 100644 (file)
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -89,6 +89,12 @@ public:
     */
     void AddHandler(wxXmlResourceHandler* handler);
 
     */
     void AddHandler(wxXmlResourceHandler* handler);
 

+    /**
+       Add a new handler at the begining of the handler list.
+     */
+    void InsertHandler(wxXmlResourceHandler *handler);
+
+    

     /**
         Attaches an unknown control to the given panel/window/dialog.
         Unknown controls are used in conjunction with \<object class="unknown"\>.
     /**
         Attaches an unknown control to the given panel/window/dialog.
         Unknown controls are used in conjunction with \<object class="unknown"\>.


@@ -103,6 +109,14 @@ public:
     */
     void ClearHandlers();
 
     */
     void ClearHandlers();
 

+    /**
+       Registers subclasses factory for use in XRC.  This is useful only for
+       language bindings developers who need a way to implement subclassing in
+       wxWidgets ports that don't support wxRTTI (e.g. wxPython).
+    */
+    static void AddSubclassFactory(wxXmlSubclassFactory *factory);
+
+    

     /**
         Compares the XRC version to the argument.
 
     /**
         Compares the XRC version to the argument.
 


@@ -260,7 +274,16 @@ public:
     bool LoadDialog(wxDialog* dlg, wxWindow* parent, const wxString& name);
 
     /**
     bool LoadDialog(wxDialog* dlg, wxWindow* parent, const wxString& name);
 
     /**

-        Loads a frame.
+       Loads a frame from the resource. @a parent points to parent window (if any).
+    */
+    wxFrame *LoadFrame(wxWindow* parent, const wxString& name);
+
+    /**
+        Loads the contents of a frame onto an existing wxFrame.
+
+        This form is used to finish creation of an already existing instance
+        (the main reason for this is that you may want to use derived class
+        with a new event table).

     */
     bool LoadFrame(wxFrame* frame, wxWindow* parent,
                    const wxString& name);
     */
     bool LoadFrame(wxFrame* frame, wxWindow* parent,
                    const wxString& name);