add wxUSE_EDITABLELISTBOX

[wxWidgets.git] / include / wx / xrc / xmlres.h

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 715133b2cbc85e3dd1ee93e1b910ae60d89b4cca..d5da40ca6099f32ce0166f0458f0790c61a2b3fb 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -17,6 +17,7 @@
 
 #include "wx/string.h"
 #include "wx/dynarray.h"
 
 #include "wx/string.h"
 #include "wx/dynarray.h"

+#include "wx/arrstr.h"

 #include "wx/datetime.h"
 #include "wx/list.h"
 #include "wx/gdicmn.h"
 #include "wx/datetime.h"
 #include "wx/list.h"
 #include "wx/gdicmn.h"


@@ -25,6 +26,7 @@
 #include "wx/icon.h"
 #include "wx/artprov.h"
 #include "wx/colour.h"
 #include "wx/icon.h"
 #include "wx/artprov.h"
 #include "wx/colour.h"

+#include "wx/animate.h"

 
 #include "wx/xml/xml.h"
 
 
 #include "wx/xml/xml.h"
 


@@ -112,7 +114,7 @@ public:
     //              don't check the modification time of the XRC files and
     //              reload them if they have changed on disk
     wxXmlResource(int flags = wxXRC_USE_LOCALE,
     //              don't check the modification time of the XRC files and
     //              reload them if they have changed on disk
     wxXmlResource(int flags = wxXRC_USE_LOCALE,

-                  const wxString& domain=wxEmptyString);
+                  const wxString& domain = wxEmptyString);

 
     // Constructor.
     // Flags: wxXRC_USE_LOCALE
 
     // Constructor.
     // Flags: wxXRC_USE_LOCALE


@@ -122,10 +124,12 @@ public:
     //              subclass property of object nodes will be ignored
     //              (useful for previews in XRC editors)
     wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE,
     //              subclass property of object nodes will be ignored
     //              (useful for previews in XRC editors)
     wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE,

-                  const wxString& domain=wxEmptyString);
+                  const wxString& domain = wxEmptyString);

 
     // Destructor.
 
     // Destructor.

-    ~wxXmlResource();
+    virtual ~wxXmlResource();
+
+    wxXmlNode *GetFirstRoot();

 
     // Loads resources from XML files that match given filemask.
     // This method understands VFS (see filesys.h).
 
     // Loads resources from XML files that match given filemask.
     // This method understands VFS (see filesys.h).


@@ -220,9 +224,13 @@ public:
     // 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
     // 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.
+    // wxWindow::NewControlId(). Otherwise value_if_not_found is used.

     // Macro XRCID(name) is provided for convenient use in event tables.
     // Macro XRCID(name) is provided for convenient use in event tables.

-    static int GetXRCID(const wxChar *str_id, int value_if_not_found = wxID_NONE);
+    static int GetXRCID(const wxString& str_id, int value_if_not_found = wxID_NONE)
+        { return DoGetXRCID(str_id.mb_str(), value_if_not_found); }
+
+    // version for internal use only
+    static int DoGetXRCID(const char *str_id, int value_if_not_found = wxID_NONE);

 
     // Returns version information (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a).
     long GetVersion() const { return m_version; }
 
     // Returns version information (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a).
     long GetVersion() const { return m_version; }


@@ -246,10 +254,11 @@ public:
     // Set flags after construction.
     void SetFlags(int flags) { m_flags = flags; }
 
     // 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.
-    wxChar* GetDomain() const { return m_domain; }
-    void SetDomain(const wxChar* domain);
-    
+    // Get/Set the domain to be passed to the translation functions, defaults
+    // to empty string (no domain).
+    const wxString& GetDomain() const { return m_domain; }
+    void SetDomain(const wxString& domain);
+

 protected:
     // Scans the resources list for unloaded files and loads them. Also reloads
     // files that have been modified since last loading.
 protected:
     // Scans the resources list for unloaded files and loads them. Also reloads
     // files that have been modified since last loading.


@@ -290,8 +299,8 @@ private:
 #endif
 
     // domain to pass to translation functions, if any.
 #endif
 
     // domain to pass to translation functions, if any.

-    wxChar* m_domain;
-    
+    wxString m_domain;
+

     friend class wxXmlResourceHandler;
     friend class wxXmlResourceModule;
 
     friend class wxXmlResourceHandler;
     friend class wxXmlResourceModule;
 


@@ -314,7 +323,7 @@ private:
 //    END_EVENT_TABLE()
 
 #define XRCID(str_id) \
 //    END_EVENT_TABLE()
 
 #define XRCID(str_id) \

-    wxXmlResource::GetXRCID(wxT(str_id))
+    wxXmlResource::DoGetXRCID(str_id)

 
 
 // This macro returns pointer to particular control in dialog
 
 
 // This macro returns pointer to particular control in dialog


@@ -450,6 +459,11 @@ protected:
                    const wxArtClient& defaultArtClient = wxART_OTHER,
                    wxSize size = wxDefaultSize);
 
                    const wxArtClient& defaultArtClient = wxART_OTHER,
                    wxSize size = wxDefaultSize);
 

+#if wxUSE_ANIMATIONCTRL
+    // Gets an animation.
+    wxAnimation GetAnimation(const wxString& param = wxT("animation"));
+#endif
+

     // Gets a font.
     wxFont GetFont(const wxString& param = wxT("font"));
 
     // Gets a font.
     wxFont GetFont(const wxString& param = wxT("font"));
 


@@ -509,13 +523,6 @@ public:
    Backward compatibility macros. Do *NOT* use, they may disappear in future
    versions of the XRC library!
    ------------------------------------------------------------------------- */
    Backward compatibility macros. Do *NOT* use, they may disappear in future
    versions of the XRC library!
    ------------------------------------------------------------------------- */

-#if WXWIN_COMPATIBILITY_2_4
-    #define ADD_STYLE         XRC_ADD_STYLE
-    #define wxTheXmlResource  wxXmlResource::Get()
-    #define XMLID             XRCID
-    #define XMLCTRL           XRCCTRL
-    #define GetXMLID          GetXRCID
-#endif

 
 #endif // wxUSE_XRC
 
 
 #endif // wxUSE_XRC