Fix scrolling bug where client size was reported wrong

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 040951fc11db2d9d8ae973d7ade71c356c1560da..17ee4098124be76f78ae3e889f0e7c47978ef411 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -28,6 +28,7 @@
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/image.h"
+    #include "wx/module.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -39,7 +40,6 @@
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
-#include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"
 
@@ -65,24 +65,41 @@ wxXmlResource *wxXmlResource::ms_instance = NULL;
     return old;
 }
 
-wxXmlResource::wxXmlResource(int flags)
+wxXmlResource::wxXmlResource(int flags, const wxString& domain)
 {
     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_domain = NULL;
+    if (! domain.empty() )
+        SetDomain(domain);
     Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
 {
+    if (m_domain)
+        free(m_domain);
     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)
@@ -215,13 +232,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {
-    m_handlers.Add(handler);
+    m_handlers.Append(handler);
     handler->SetParentResource(this);
 }
 
 void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
 {
-    m_handlers.Insert(handler, 0);
+    m_handlers.Insert(handler);
     handler->SetParentResource(this);
 }
 
@@ -229,7 +246,7 @@ void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
 
 void wxXmlResource::ClearHandlers()
 {
-    WX_CLEAR_ARRAY(m_handlers);
+    WX_CLEAR_LIST(wxList, m_handlers);
 }
 
 
@@ -672,19 +689,26 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
         return CreateResFromNode(&copy, parent, instance);
     }
 
+    wxXmlResourceHandler *handler;
+
     if (handlerToUse)
     {
         if (handlerToUse->CanHandle(node))
+        {
             return handlerToUse->CreateResource(node, parent, instance);
+        }
     }
     else if (node->GetName() == wxT("object"))
     {
-        for ( wxXmlResourceHandlers::iterator i = m_handlers.begin();
-              i != m_handlers.end(); ++i )
+        wxList::compatibility_iterator ND = m_handlers.GetFirst();
+        while (ND)
         {
-            wxXmlResourceHandler *handler = *i;
+            handler = (wxXmlResourceHandler*)ND->GetData();
             if (handler->CanHandle(node))
+            {
                 return handler->CreateResource(node, parent, instance);
+            }
+            ND = ND->GetNext();
         }
     }
 
@@ -909,7 +933,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
         if (translate && parNode &&
             parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
         {
-            return wxGetTranslation(str2);
+            return wxGetTranslation(str2, m_resource->GetDomain());
         }
         else
         {
@@ -1600,6 +1624,7 @@ static void AddStdXRCID_Records()
     stdID(wxID_HELP);
     stdID(wxID_PRINT);
     stdID(wxID_PRINT_SETUP);
+    stdID(wxID_PAGE_SETUP);
     stdID(wxID_PREVIEW);
     stdID(wxID_ABOUT);
     stdID(wxID_HELP_CONTENTS);