This commit was manufactured by cvs2svn to create tag 'WX_2_4_3'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_3@34198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,6 +37,9 @@ class WXDLLEXPORT wxFrame;
|
||||
class WXDLLEXPORT wxToolBar;
|
||||
|
||||
class WXXMLDLLEXPORT wxXmlResourceHandler;
|
||||
class WXXMLDLLEXPORT wxXmlSubclassFactory;
|
||||
class WXXMLDLLEXPORT wxXmlSubclassFactoriesList;
|
||||
class wxXmlResourceModule;
|
||||
|
||||
|
||||
// These macros indicate current version of XML resources (this information is
|
||||
@@ -55,7 +58,7 @@ class WXXMLDLLEXPORT wxXmlResourceHandler;
|
||||
#define WX_XMLRES_CURRENT_VERSION_MINOR 3
|
||||
#define WX_XMLRES_CURRENT_VERSION_RELEASE 0
|
||||
#define WX_XMLRES_CURRENT_VERSION_REVISION 1
|
||||
#define WX_XMLRES_CURRENT_VERSION_STRING "2.3.0.1"
|
||||
#define WX_XMLRES_CURRENT_VERSION_STRING wxT("2.3.0.1")
|
||||
|
||||
#define WX_XMLRES_CURRENT_VERSION \
|
||||
(WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \
|
||||
@@ -133,6 +136,11 @@ public:
|
||||
|
||||
// Removes all handlers
|
||||
void ClearHandlers();
|
||||
|
||||
// Registers subclasses factory for use in XRC. This function is not meant
|
||||
// for public use, please see the comment above wxXmlSubclassFactory
|
||||
// definition.
|
||||
static void AddSubclassFactory(wxXmlSubclassFactory *factory);
|
||||
|
||||
// Loads menu from resource. Returns NULL on failure.
|
||||
wxMenu *LoadMenu(const wxString& name);
|
||||
@@ -216,7 +224,9 @@ public:
|
||||
static wxXmlResource *Set(wxXmlResource *res);
|
||||
|
||||
// Returns flags, which may be a bitlist of wxXRC_USE_LOCALE and wxXRC_NO_SUBCLASSING.
|
||||
int GetFlags() { return m_flags; }
|
||||
int GetFlags() const { return m_flags; }
|
||||
// Set flags after construction.
|
||||
void SetFlags(int flags) { m_flags = flags; }
|
||||
|
||||
protected:
|
||||
// Scans the resources list for unloaded files and loads them. Also reloads
|
||||
@@ -230,8 +240,18 @@ protected:
|
||||
wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
|
||||
|
||||
// Creates a resource from information in the given node.
|
||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
|
||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
|
||||
wxObject *instance = NULL);
|
||||
|
||||
// Creates a resource from information in the given node
|
||||
// (Uses only 'handlerToUse' if != NULL)
|
||||
//
|
||||
// ATTENTION: Do *NOT* use this function, it will disappear in
|
||||
// wxWindows 2.5.0! It exists *only* as a hack to preserve
|
||||
// binary compatibility in 2.4.x branch.
|
||||
wxObject *CreateResFromNode2(wxXmlNode *node, wxObject *parent,
|
||||
wxObject *instance = NULL,
|
||||
wxXmlResourceHandler *handlerToUse = NULL);
|
||||
private:
|
||||
long m_version;
|
||||
|
||||
@@ -244,6 +264,9 @@ private:
|
||||
#endif
|
||||
|
||||
friend class wxXmlResourceHandler;
|
||||
friend class wxXmlResourceModule;
|
||||
|
||||
static wxXmlSubclassFactoriesList *ms_subclassFactories;
|
||||
|
||||
// singleton instance:
|
||||
static wxXmlResource *ms_instance;
|
||||
@@ -438,6 +461,20 @@ protected:
|
||||
void wxXmlInitResourceModule();
|
||||
|
||||
|
||||
// This class is used to create instances of XRC "object" nodes with "subclass"
|
||||
// property. It is _not_ supposed to be used by XRC users, you should instead
|
||||
// register your subclasses via wxWindows' RTTI mechanism. This class is useful
|
||||
// only for language bindings developer who need a way to implement subclassing
|
||||
// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
|
||||
class WXXMLDLLEXPORT wxXmlSubclassFactory
|
||||
{
|
||||
public:
|
||||
// Try to create instance of given class and return it, return NULL on failure:
|
||||
virtual wxObject *Create(const wxString& className) = 0;
|
||||
virtual ~wxXmlSubclassFactory() {}
|
||||
};
|
||||
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
Backward compatibility macros. Do *NOT* use, they may disappear in future
|
||||
versions of the XRC library!
|
||||
|
Reference in New Issue
Block a user