Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 18c84d66645e1108d12fcd89e597a8a4b31ca928..17ee4098124be76f78ae3e889f0e7c47978ef411 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -26,6 +26,9 @@
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/settings.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__
 #endif
 
 #ifndef __WXWINCE__


@@ -37,9 +40,6 @@
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.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"
 


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


@@ -1147,6 +1168,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;


@@ -1595,6 +1624,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);