use wxChar correctly in wxString docs; mark wx1 compatibility functions

[wxWidgets.git] / src / xrc / xmlres.cpp

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index e8d66785f7c45e06fc305d995597c166504f8e71..c2aa6a5586fb6c66dd94f44465d58380bbb6c964 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -24,24 +24,24 @@
     #include "wx/log.h"
     #include "wx/panel.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/panel.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+    #include "wx/module.h"

 #endif
 
 #ifndef __WXWINCE__
     #include <locale.h>
 #endif
 
 #endif
 
 #ifndef __WXWINCE__
     #include <locale.h>
 #endif
 

-#include "wx/dialog.h"

 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"

-#include "wx/module.h"
-#include "wx/bitmap.h"
-#include "wx/image.h"

 #include "wx/fontmap.h"
 #include "wx/artprov.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"

-#include "wx/settings.h"

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


@@ -65,24 +65,41 @@ wxXmlResource *wxXmlResource::ms_instance = NULL;
     return old;
 }
 
     return old;
 }
 

-wxXmlResource::wxXmlResource(int flags)
+wxXmlResource::wxXmlResource(int flags, const wxString& domain)

 {
     m_flags = flags;
     m_version = -1;
 {
     m_flags = flags;
     m_version = -1;

+    m_domain = NULL;
+    if (! domain.empty() )
+        SetDomain(domain);

 }
 
 }
 

-wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
+wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)

 {
     m_flags = flags;
     m_version = -1;
 {
     m_flags = flags;
     m_version = -1;

+    m_domain = NULL;
+    if (! domain.empty() )
+        SetDomain(domain);

     Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
 {
     Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
 {

+    if (m_domain)
+        free(m_domain);

     ClearHandlers();
 }
 
     ClearHandlers();
 }
 

+void wxXmlResource::SetDomain(const wxChar* domain)
+{
+    if (m_domain)
+        free(m_domain);
+    m_domain = NULL;
+    if (domain && wxStrlen(domain))
+        m_domain = wxStrdup(domain);
+}
+

 
 /* static */
 wxString wxXmlResource::ConvertFileNameToURL(const wxString& filename)
 
 /* static */
 wxString wxXmlResource::ConvertFileNameToURL(const wxString& filename)


@@ -643,7 +660,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         }
     }
 
         }
     }
 

-    if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+    if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() )

          dest.SetContent(with.GetContent());
 }
 
          dest.SetContent(with.GetContent());
 }
 


@@ -916,7 +933,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
         if (translate && parNode &&
             parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
         {
         if (translate && parNode &&
             parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
         {

-            return wxGetTranslation(str2);
+            return wxGetTranslation(str2, m_resource->GetDomain());

         }
         else
         {
         }
         else
         {


@@ -1042,9 +1059,13 @@ static wxColour GetSystemColour(const wxString& name)
     return wxNullColour;
 }
 
     return wxNullColour;
 }
 

-wxColour wxXmlResourceHandler::GetColour(const wxString& param)
+wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv)

 {
     wxString v = GetParamValue(param);
 {
     wxString v = GetParamValue(param);

+
+    if ( v.empty() )
+        return defaultv;
+

     wxColour clr;
 
     // wxString -> wxColour conversion
     wxColour clr;
 
     // wxString -> wxColour conversion


@@ -1118,6 +1139,39 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
     return wxBitmap(img);
 }
 
     return wxBitmap(img);
 }
 

+#if wxUSE_ANIMATIONCTRL
+wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param)
+{
+    wxAnimation ani;
+
+    /* load the animation from file: */
+    wxString name = GetParamValue(param);
+    if (name.empty()) return wxNullAnimation;
+#if wxUSE_FILESYSTEM
+    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
+    if (fsfile == NULL)
+    {
+        wxLogError(_("XRC resource: Cannot create animation from '%s'."),
+                   name.c_str());
+        return wxNullAnimation;
+    }
+    ani.Load(*(fsfile->GetStream()));
+    delete fsfile;
+#else
+    ani.LoadFile(name);
+#endif
+
+    if (!ani.IsOk())
+    {
+        wxLogError(_("XRC resource: Cannot create animation from '%s'."),
+                   name.c_str());
+        return wxNullAnimation;
+    }
+
+    return ani;
+}
+#endif      // wxUSE_ANIMATIONCTRL
+

 
 
 wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
 
 
 wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,


@@ -1147,6 +1201,14 @@ wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 }
 
 
 }
 
 

+
+bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
+{
+    return node->GetPropVal(wxT("class"), wxEmptyString) == classname;
+}
+
+
+

 wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 {
     wxXmlNode *n = node;
 wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 {
     wxXmlNode *n = node;


@@ -1351,15 +1413,14 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     if (hasFacename)
     {
         wxString faces = GetParamValue(wxT("face"));
     if (hasFacename)
     {
         wxString faces = GetParamValue(wxT("face"));

-        wxFontEnumerator enu;
-        enu.EnumerateFacenames();
+        wxArrayString facenames(wxFontEnumerator::GetFacenames());

         wxStringTokenizer tk(faces, wxT(","));
         while (tk.HasMoreTokens())
         {
         wxStringTokenizer tk(faces, wxT(","));
         while (tk.HasMoreTokens())
         {

-            int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
+            int index = facenames.Index(tk.GetNextToken(), false);

             if (index != wxNOT_FOUND)
             {
             if (index != wxNOT_FOUND)
             {

-                facename = (*enu.GetFacenames())[index];
+                facename = facenames[index];

                 break;
             }
         }
                 break;
             }
         }


@@ -1497,7 +1558,7 @@ struct XRCID_record
 
 static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
 
 
 static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
 

-static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
+static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE)

 {
     int index = 0;
 
 {
     int index = 0;
 


@@ -1521,7 +1582,7 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
     (*rec_var)->next = NULL;
 
     wxChar *end;
     (*rec_var)->next = NULL;
 
     wxChar *end;

-    if (value_if_not_found != -2)
+    if (value_if_not_found != wxID_NONE)

         (*rec_var)->id = value_if_not_found;
     else
     {
         (*rec_var)->id = value_if_not_found;
     else
     {


@@ -1542,7 +1603,8 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
 
 static void AddStdXRCID_Records();
 
 
 static void AddStdXRCID_Records();
 

-/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+/*static*/
+int wxXmlResource::GetXRCID(const wxChar *str_id, int value_if_not_found)

 {
     static bool s_stdIDsAdded = false;
 
 {
     static bool s_stdIDsAdded = false;
 


@@ -1552,7 +1614,7 @@ static void AddStdXRCID_Records();
         AddStdXRCID_Records();
     }
 
         AddStdXRCID_Records();
     }
 

-    return XRCID_Lookup(str_id);
+    return XRCID_Lookup(str_id, value_if_not_found);

 }
 
 
 }
 
 


@@ -1595,6 +1657,7 @@ static void AddStdXRCID_Records()
     stdID(wxID_HELP);
     stdID(wxID_PRINT);
     stdID(wxID_PRINT_SETUP);
     stdID(wxID_HELP);
     stdID(wxID_PRINT);
     stdID(wxID_PRINT_SETUP);

+    stdID(wxID_PAGE_SETUP);

     stdID(wxID_PREVIEW);
     stdID(wxID_ABOUT);
     stdID(wxID_HELP_CONTENTS);
     stdID(wxID_PREVIEW);
     stdID(wxID_ABOUT);
     stdID(wxID_HELP_CONTENTS);