added timestamping to wxLogStream

[wxWidgets.git] / contrib / src / xml / xmlres.cpp

diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp
index fb4f564a575bf4027a3989719f2acf97e72d91be..04ca779d3837adff6ce542f06854ba5041d37bb8 100644 (file)
--- a/contrib/src/xml/xmlres.cpp
+++ b/contrib/src/xml/xmlres.cpp
@@ -26,9 +26,11 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"

+#include "wx/fontenum.h"

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

+#include "wx/fontmap.h"

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


@@ -37,13 +39,15 @@
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 

-wxXmlResource::wxXmlResource()
+wxXmlResource::wxXmlResource(bool use_locale)

 {
     m_Handlers.DeleteContents(TRUE);
 {
     m_Handlers.DeleteContents(TRUE);

+    m_UseLocale = use_locale;

 }
     
 }
     

-wxXmlResource::wxXmlResource(const wxString& filemask)
+wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale)

 {
 {

+    m_UseLocale = use_locale;

     m_Handlers.DeleteContents(TRUE);
     Load(filemask);
 }
     m_Handlers.DeleteContents(TRUE);
     Load(filemask);
 }


@@ -127,21 +131,21 @@ void wxXmlResource::ClearHandlers()
 
 wxMenu *wxXmlResource::LoadMenu(const wxString& name)
 {
 
 wxMenu *wxXmlResource::LoadMenu(const wxString& name)
 {

-    return (wxMenu*)CreateResFromNode(FindResource(name, wxT("menu")), NULL, NULL);
+    return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);

 }
 
 
 
 wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name)
 {
 }
 
 
 
 wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name)
 {

-    return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("menubar")), NULL, NULL);
+    return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), NULL, NULL);

 }
 
 
 
 wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
 {
 }
 
 
 
 wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
 {

-    return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("toolbar")), parent, NULL);
+    return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL);

 }
 
 
 }
 
 


@@ -156,22 +160,41 @@ wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
 
 bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)
 {
 
 bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)
 {

-    return CreateResFromNode(FindResource(name, wxT("dialog")), parent, dlg) != NULL;
+    return CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, dlg) != NULL;

 }
 
 
 
 wxPanel *wxXmlResource::LoadPanel(wxWindow *parent, const wxString& name)
 {
 }
 
 
 
 wxPanel *wxXmlResource::LoadPanel(wxWindow *parent, const wxString& name)
 {

-    wxPanel *panel = new wxPanel;
-    if (!LoadPanel(panel, parent, name))
-        { delete panel; return NULL; }
-    else return panel;
+    return (wxPanel*)CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, NULL);

 }
 
 bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name)
 {
 }
 
 bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name)
 {

-    return CreateResFromNode(FindResource(name, wxT("panel")), parent, panel) != NULL;
+    return CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, panel) != NULL;
+}
+
+
+
+wxBitmap wxXmlResource::LoadBitmap(const wxString& name)
+{
+    wxBitmap *bmp = (wxBitmap*)CreateResFromNode(
+                               FindResource(name, wxT("wxBitmap")), NULL, NULL);
+    wxBitmap rt;
+
+    if (bmp) { rt = *bmp; delete bmp; }
+    return rt;
+}
+
+wxIcon wxXmlResource::LoadIcon(const wxString& name)
+{
+    wxIcon *icon = (wxIcon*)CreateResFromNode(
+                            FindResource(name, wxT("wxIcon")), NULL, NULL);
+    wxIcon rt;
+
+    if (icon) { rt = *icon; delete icon; }
+    return rt;

 }
 
 
 }
 
 


@@ -291,7 +314,7 @@ void wxXmlResource::UpdateResources()
 
 
 
 
 
 

-wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& type)
+wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname)

 {
     UpdateResources(); //ensure everything is up-to-date
     
 {
     UpdateResources(); //ensure everything is up-to-date
     


@@ -301,10 +324,12 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& typ
         if (m_Data[f].Doc == NULL || m_Data[f].Doc->GetRoot() == NULL) continue;
         for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren(); 
                                       node; node = node->GetNext())
         if (m_Data[f].Doc == NULL || m_Data[f].Doc->GetRoot() == NULL) continue;
         for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren(); 
                                       node; node = node->GetNext())

-            if (    node->GetType() == wxXML_ELEMENT_NODE &&
-                    (!type || node->GetName() == type) &&
-                    node->GetPropVal(wxT("name"), &dummy) &&
-                    dummy == name)
+            if (node->GetType() == wxXML_ELEMENT_NODE &&
+                (!classname || 
+                  node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
+                node->GetName() == wxT("object") &&
+                node->GetPropVal(wxT("name"), &dummy) &&
+                dummy == name)

             {
 #if wxUSE_FILESYSTEM
                 m_CurFileSystem.ChangePathTo(m_Data[f].File);
             {
 #if wxUSE_FILESYSTEM
                 m_CurFileSystem.ChangePathTo(m_Data[f].File);


@@ -313,8 +338,8 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& typ
             }
     }
 
             }
     }
 

-    wxLogError(_("XML resource '%s' (type '%s') not found!"), 
-               name.c_str(), type.c_str());
+    wxLogError(_("XML resource '%s' (class '%s') not found!"), 
+               name.c_str(), classname.c_str());

     return NULL;
 }
 
     return NULL;
 }
 


@@ -330,7 +355,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
     while (ND)
     {
         handler = (wxXmlResourceHandler*)ND->GetData();
     while (ND)
     {
         handler = (wxXmlResourceHandler*)ND->GetData();

-        if (handler->CanHandle(node))
+        if (node->GetName() == _T("object") && handler->CanHandle(node))

         {
             ret = handler->CreateResource(node, parent, instance);
             if (ret) return ret;
         {
             ret = handler->CreateResource(node, parent, instance);
             if (ret) return ret;


@@ -338,7 +363,9 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
         ND = ND->GetNext();
     }
 
         ND = ND->GetNext();
     }
 

-    wxLogError(_("No handler found for XML node '%s'!"), node->GetName().c_str());
+    wxLogError(_("No handler found for XML node '%s', class '%s'!"), 
+               node->GetName().c_str(), 
+               node->GetPropVal(_T("class"), wxEmptyString).c_str());

     return NULL;
 }
 
     return NULL;
 }
 


@@ -360,10 +387,12 @@ wxXmlResourceHandler::wxXmlResourceHandler()
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {
     wxXmlNode *myNode = m_Node;
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {
     wxXmlNode *myNode = m_Node;

+    wxString myClass = m_Class;

     wxObject *myParent = m_Parent, *myInstance = m_Instance;
     wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
     
     m_Node = node;
     wxObject *myParent = m_Parent, *myInstance = m_Instance;
     wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
     
     m_Node = node;

+    m_Class = node->GetPropVal(_T("class"), wxEmptyString);

     m_Parent = parent;
     m_Instance = instance;
     m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);
     m_Parent = parent;
     m_Instance = instance;
     m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);


@@ -372,6 +401,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     wxObject *returned = DoCreateResource();
     
     m_Node = myNode;
     wxObject *returned = DoCreateResource();
     
     m_Node = myNode;

+    m_Class = myClass;

     m_Parent = myParent; m_ParentAsWindow = myParentAW;
     m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
     
     m_Parent = myParent; m_ParentAsWindow = myParentAW;
     m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
     


@@ -386,6 +416,21 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 }
 
 
 }
 
 

+
+void wxXmlResourceHandler::AddWindowStyles()
+{
+    ADD_STYLE(wxSIMPLE_BORDER);
+    ADD_STYLE(wxSUNKEN_BORDER);
+    ADD_STYLE(wxDOUBLE_BORDER);
+    ADD_STYLE(wxRAISED_BORDER);
+    ADD_STYLE(wxSTATIC_BORDER);
+    ADD_STYLE(wxTRANSPARENT_WINDOW);
+    ADD_STYLE(wxWANTS_CHARS);
+    ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
+}
+
+
+

 bool wxXmlResourceHandler::HasParam(const wxString& param)
 {
     return (GetParamNode(param) != NULL);
 bool wxXmlResourceHandler::HasParam(const wxString& param)
 {
     return (GetParamNode(param) != NULL);


@@ -443,7 +488,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
             }
         else str2 << *dt;
     }
             }
         else str2 << *dt;
     }

-    return str2;
+    
+    if (m_Resource->GetUseLocale())
+        return wxGetTranslation(str2);
+    else
+        return str2;

 }
 
 
 }
 
 


@@ -552,7 +601,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
 
 wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
 {
 
 wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
 {

-#ifdef __WXMSW__
+#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)

     wxIcon icon;
     icon.CopyFromBitmap(GetBitmap(param, size));
 #else
     wxIcon icon;
     icon.CopyFromBitmap(GetBitmap(param, size));
 #else


@@ -600,7 +649,10 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {

-    return GetNodeContent(GetParamNode(param));
+    if (param.IsEmpty())
+        return GetNodeContent(m_Node);
+    else
+        return GetNodeContent(GetParamNode(param));

 }
 
 
 }
 
 


@@ -647,9 +699,102 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param)
 
 
 
 
 
 

+wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv)
+{
+    wxString s = GetParamValue(param);
+    if (s.IsEmpty()) return defaultv;
+    bool is_dlg;
+    long sx;
+    
+    is_dlg = s[s.Length()-1] == _T('d');
+    if (is_dlg) s.RemoveLast();
+    
+    if (!s.ToLong(&sx))
+    {
+        wxLogError(_("Cannot parse dimension from '%s'."), s.mb_str());
+        return defaultv;
+    }
+    
+    if (is_dlg)
+    {
+        if (m_InstanceAsWindow)
+            return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, 0)).x;
+        else if (m_ParentAsWindow)
+            return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, 0)).x;
+        else
+        {
+            wxLogError(_("Cannot convert dialog units: dialog unknown."));
+            return defaultv;
+        }
+    }
+    else return sx;
+}
+
+
+
+wxFont wxXmlResourceHandler::GetFont(const wxString& param)
+{    
+    wxXmlNode *font_node = GetParamNode(param);
+    if (font_node == NULL)
+    {
+        wxLogError(_("Cannot find font node '%s'."), param.mb_str());
+        return wxNullFont;
+    }
+    
+    wxXmlNode *oldnode = m_Node;
+    m_Node = font_node;
+
+    long size = GetLong(_T("size"), 12);
+
+    wxString style = GetParamValue(_T("style"));
+    wxString weight = GetParamValue(_T("weight"));
+    int istyle = wxNORMAL, iweight = wxNORMAL;  
+    if (style == _T("italic")) istyle = wxITALIC;
+    else if (style == _T("slant")) istyle = wxSLANT;
+    if (weight == _T("bold")) iweight = wxBOLD;
+    else if (weight == _T("light")) iweight = wxLIGHT;
+
+    wxString family = GetParamValue(_T("family"));
+    int ifamily = wxDEFAULT;
+         if (family == _T("decorative")) ifamily = wxDECORATIVE;
+    else if (family == _T("roman")) ifamily = wxROMAN;
+    else if (family == _T("script")) ifamily = wxSCRIPT;
+    else if (family == _T("swiss")) ifamily = wxSWISS;
+    else if (family == _T("modern")) ifamily = wxMODERN;
+
+    bool underlined = GetBool(_T("underlined"), FALSE);
+
+    wxString encoding = GetParamValue(_T("encoding"));
+    wxFontMapper mapper;
+    wxFontEncoding enc = wxFONTENCODING_DEFAULT;
+    if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding);
+    if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM;
+
+    wxString faces = GetParamValue(_T("face"));
+    wxString facename = wxEmptyString;
+    wxFontEnumerator enu;
+    enu.EnumerateFacenames();
+    wxStringTokenizer tk(faces, _T(","));
+    while (tk.HasMoreTokens()) 
+    {
+        int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);
+        if (index != wxNOT_FOUND) 
+        {
+            facename = (*enu.GetFacenames())[index];
+            break;
+        }
+    }
+    
+    m_Node = oldnode;
+    
+    wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);
+    return font;
+}
+
+

 void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 {
 void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 {

-    //FIXME : add font, cursor
+    //FIXME : add cursor

     
     if (HasParam(_T("exstyle")))
         wnd->SetExtraStyle(GetStyle(_T("exstyle")));
     
     if (HasParam(_T("exstyle")))
         wnd->SetExtraStyle(GetStyle(_T("exstyle")));


@@ -667,26 +812,22 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
     if (HasParam(_T("tooltip")))
         wnd->SetToolTip(GetText(_T("tooltip")));
 #endif      
     if (HasParam(_T("tooltip")))
         wnd->SetToolTip(GetText(_T("tooltip")));
 #endif      

+    if (HasParam(_T("font")))
+        wnd->SetFont(GetFont());

 }
 
 
 }
 
 

-void wxXmlResourceHandler::CreateChildren(wxObject *parent, 
-                bool only_this_handler, wxXmlNode *children_node)
+void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only)

 {
 {

-    if (children_node == NULL) children_node = GetParamNode(_T("children"));
-    if (children_node == NULL) return;
-
-    wxXmlNode *n = children_node->GetChildren();
+    wxXmlNode *n = m_Node->GetChildren();

 
     while (n)
     {
 
     while (n)
     {

-        if (n->GetType() == wxXML_ELEMENT_NODE)
+        if (n->GetType() == wxXML_ELEMENT_NODE &&
+            n->GetName() == _T("object"))

         {        
         {        

-            if (only_this_handler)
-            {
-                if (CanHandle(n))
-                    CreateResource(n, parent, NULL);
-            }
+            if (this_hnd_only && CanHandle(n))
+                CreateResource(n, parent, NULL);

             else
                 m_Resource->CreateResFromNode(n, parent, NULL);
         }
             else
                 m_Resource->CreateResFromNode(n, parent, NULL);
         }


@@ -695,6 +836,23 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent,
 }
 
 
 }
 
 

+void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode)
+{
+    wxXmlNode *root;
+    if (rootnode == NULL) root = m_Node; else root = rootnode;
+    wxXmlNode *n = root->GetChildren();
+
+    while (n)
+    {
+        if (n->GetType() == wxXML_ELEMENT_NODE && CanHandle(n))
+        {
+            CreateResource(n, parent, NULL);
+        }
+        n = n->GetNext();
+    }
+}
+
+

 
 
 
 
 
 


@@ -730,9 +888,6 @@ static int XMLID_LastID = wxID_HIGHEST;
     {
         if (strcmp(rec->key, str_id) == 0)
         {
     {
         if (strcmp(rec->key, str_id) == 0)
         {

-#ifdef DEBUG_XMLID_HASH
-            printf("XMLID: matched '%s' (%ith item)\n", rec->key, matchcnt);
-#endif

             return rec->id;
         }
         matchcnt++;
             return rec->id;
         }
         matchcnt++;


@@ -745,10 +900,6 @@ static int XMLID_LastID = wxID_HIGHEST;
     (*rec_var)->id = ++XMLID_LastID;
     (*rec_var)->key = strdup(str_id);
     (*rec_var)->next = NULL;
     (*rec_var)->id = ++XMLID_LastID;
     (*rec_var)->key = strdup(str_id);
     (*rec_var)->next = NULL;

-#ifdef DEBUG_XMLID_HASH
-    printf("XMLID: new key for '%s': %i at %i (%ith item)\n", 
-           (*rec_var)->key, (*rec_var)->id, index, matchcnt);
-#endif

     
     return (*rec_var)->id;
 }
     
     return (*rec_var)->id;
 }


@@ -758,9 +909,6 @@ static void CleanXMLID_Record(XMLID_record *rec)
 {
     if (rec)
     {
 {
     if (rec)
     {

-#ifdef DEBUG_XMLID_HASH
-        printf("XMLID: clearing '%s'\n", rec->key);
-#endif

         CleanXMLID_Record(rec->next);
         free (rec->key);
         delete rec;
         CleanXMLID_Record(rec->next);
         free (rec->key);
         delete rec;