Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-11-30 22:28:11 +00:00
parent 88932ec82d
commit c1bd5a6d3f
3 changed files with 36 additions and 2 deletions

View File

@@ -200,7 +200,7 @@ public:
@see wxAnimationCtrl, @sample{animate}
*/
class wxAnimation : public wxGDIObject
class wxAnimation : public wxObject
{
public:
/**

View File

@@ -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

View File

@@ -89,6 +89,12 @@ public:
*/
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"\>.
@@ -103,6 +109,14 @@ public:
*/
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.
@@ -260,7 +274,16 @@ public:
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);