disable select root menu command when the root is hidden

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index ba4e8648705a26cb6e345481447b37eac1c8226e..b10e7dfcb89d9f4f3e5699f27e2b526d30fda87b 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xmlres.cpp
+// Name:        src/xrc/xmlres.cpp

 // Purpose:     XRC resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -17,29 +17,33 @@
 
 #if wxUSE_XRC
 
 
 #if wxUSE_XRC
 

+#include "wx/xrc/xmlres.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.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__
 #ifndef __WXWINCE__

-#include <locale.h>
+    #include <locale.h>

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-#include "wx/panel.h"
-#include "wx/frame.h"

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

-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/tokenzr.h"
 #include "wx/fontenum.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"

-#include "wx/xrc/xmlres.h"

 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords)
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords)


@@ -61,16 +65,18 @@ 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;

+    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;

+    SetDomain(domain);

     Load(filemask);
 }
 
     Load(filemask);
 }
 


@@ -79,6 +85,11 @@ wxXmlResource::~wxXmlResource()
     ClearHandlers();
 }
 
     ClearHandlers();
 }
 

+void wxXmlResource::SetDomain(const wxString& domain)
+{
+    m_domain = domain;
+}
+

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


@@ -411,7 +422,11 @@ bool wxXmlResource::UpdateResources()
         {
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);
         {
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);

+#           if wxUSE_DATETIME

             modif = file && file->GetModificationTime() > m_data[i].Time;
             modif = file && file->GetModificationTime() > m_data[i].Time;

+#           else // wxUSE_DATETIME
+            modif = true;
+#           endif // wxUSE_DATETIME

             if (!file)
             {
                 wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
             if (!file)
             {
                 wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());


@@ -419,9 +434,13 @@ bool wxXmlResource::UpdateResources()
             }
             wxDELETE(file);
             wxUnusedVar(file);
             }
             wxDELETE(file);
             wxUnusedVar(file);

-#           else
+#           else // wxUSE_FILESYSTEM
+#           if wxUSE_DATETIME

             modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
             modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;

-#           endif
+#           else // wxUSE_DATETIME
+            modif = true;
+#           endif // wxUSE_DATETIME
+#           endif // wxUSE_FILESYSTEM

         }
 
         if (modif)
         }
 
         if (modif)


@@ -477,11 +496,13 @@ bool wxXmlResource::UpdateResources()
                 }
 
                 ProcessPlatformProperty(m_data[i].Doc->GetRoot());
                 }
 
                 ProcessPlatformProperty(m_data[i].Doc->GetRoot());

+#if wxUSE_DATETIME

 #if wxUSE_FILESYSTEM
                 m_data[i].Time = file->GetModificationTime();
 #if wxUSE_FILESYSTEM
                 m_data[i].Time = file->GetModificationTime();

-#else
+#else // wxUSE_FILESYSTEM

                 m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
                 m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));

-#endif
+#endif // wxUSE_FILESYSTEM
+#endif // wxUSE_DATETIME

             }
 
 #           if wxUSE_FILESYSTEM
             }
 
 #           if wxUSE_FILESYSTEM


@@ -615,10 +636,21 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         }
 
         if ( !dnode )
         }
 
         if ( !dnode )

-            dest.AddChild(new wxXmlNode(*node));
+        {
+            static const wxChar *AT_END = wxT("end");
+            wxString insert_pos = node->GetPropVal(wxT("insert_at"), AT_END);
+            if ( insert_pos == AT_END )
+            {
+                dest.AddChild(new wxXmlNode(*node));
+            }
+            else if ( insert_pos == wxT("begin") )
+            {
+                dest.InsertChild(new wxXmlNode(*node), dest.GetChildren());
+            }
+        }

     }
 
     }
 

-    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());
 }
 


@@ -776,17 +808,21 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 void wxXmlResourceHandler::AddWindowStyles()
 {
     XRC_ADD_STYLE(wxCLIP_CHILDREN);
 void wxXmlResourceHandler::AddWindowStyles()
 {
     XRC_ADD_STYLE(wxCLIP_CHILDREN);

-    XRC_ADD_STYLE(wxSIMPLE_BORDER);
-    XRC_ADD_STYLE(wxSUNKEN_BORDER);
-    XRC_ADD_STYLE(wxDOUBLE_BORDER);
-    XRC_ADD_STYLE(wxRAISED_BORDER);
-    XRC_ADD_STYLE(wxSTATIC_BORDER);
-    XRC_ADD_STYLE(wxNO_BORDER);
+
+    // the border styles all have the old and new names, recognize both for now
+    XRC_ADD_STYLE(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
+    XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN);
+    XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE);
+    XRC_ADD_STYLE(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
+    XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
+    XRC_ADD_STYLE(wxNO_BORDER);     XRC_ADD_STYLE(wxBORDER_NONE);
+

     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);

+    XRC_ADD_STYLE(wxALWAYS_SHOW_SB);

     XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
 }
     XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
 }


@@ -887,7 +923,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
         {


@@ -1013,19 +1049,21 @@ 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);
 

-    // find colour using HTML syntax (#RRGGBB)
-    unsigned long tmp = 0;
+    if ( v.empty() )
+        return defaultv;
+
+    wxColour clr;

 
 

-    if (v.Length() != 7 || v[0u] != wxT('#') ||
-        wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
+    // wxString -> wxColour conversion
+    if (!clr.Set(v))

     {
         // the colour doesn't use #RRGGBB format, check if it is symbolic
         // colour name:
     {
         // the colour doesn't use #RRGGBB format, check if it is symbolic
         // colour name:

-        wxColour clr = GetSystemColour(v);
+        clr = GetSystemColour(v);

         if (clr.Ok())
             return clr;
 
         if (clr.Ok())
             return clr;
 


@@ -1034,9 +1072,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
         return wxNullColour;
     }
 
         return wxNullColour;
     }
 

-    return wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
-                    (unsigned char) ((tmp & 0x00FF00) >> 8),
-                    (unsigned char) ((tmp & 0x0000FF)));
+    return clr;

 }
 
 
 }
 
 


@@ -1070,7 +1106,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
     wxString name = GetParamValue(param);
     if (name.empty()) return wxNullBitmap;
 #if wxUSE_FILESYSTEM
     wxString name = GetParamValue(param);
     if (name.empty()) return wxNullBitmap;
 #if wxUSE_FILESYSTEM

-    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
+    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);

     if (fsfile == NULL)
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
     if (fsfile == NULL)
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),


@@ -1080,19 +1116,51 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else

-    wxImage img(GetParamValue(wxT("bitmap")));
+    wxImage img(name);

 #endif
 
     if (!img.Ok())
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
 #endif
 
     if (!img.Ok())
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),

-                   param.c_str());
+                   name.c_str());

         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
     return wxBitmap(img);
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
     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, wxFS_READ | wxFS_SEEKABLE);
+    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

 
 
 
 
 
 


@@ -1123,6 +1191,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;


@@ -1159,7 +1235,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param,
     bool is_dlg;
     long sx, sy = 0;
 
     bool is_dlg;
     long sx, sy = 0;
 

-    is_dlg = s[s.Length()-1] == wxT('d');
+    is_dlg = s[s.length()-1] == wxT('d');

     if (is_dlg) s.RemoveLast();
 
     if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
     if (is_dlg) s.RemoveLast();
 
     if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||


@@ -1208,7 +1284,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param,
     bool is_dlg;
     long sx;
 
     bool is_dlg;
     long sx;
 

-    is_dlg = s[s.Length()-1] == wxT('d');
+    is_dlg = s[s.length()-1] == wxT('d');

     if (is_dlg) s.RemoveLast();
 
     if (!s.ToLong(&sx))
     if (is_dlg) s.RemoveLast();
 
     if (!s.ToLong(&sx))


@@ -1274,10 +1350,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     // font attributes:
 
     // size
     // font attributes:
 
     // size

-    int isize = wxDEFAULT;
+    int isize = -1;

     bool hasSize = HasParam(wxT("size"));
     if (hasSize)
     bool hasSize = HasParam(wxT("size"));
     if (hasSize)

-        isize = GetLong(wxT("size"), wxDEFAULT);
+        isize = GetLong(wxT("size"), -1);

 
     // style
     int istyle = wxNORMAL;
 
     // style
     int istyle = wxNORMAL;


@@ -1327,15 +1403,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;
             }
         }


@@ -1355,36 +1430,38 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     }
 
     // is this font based on a system font?
     }
 
     // is this font based on a system font?

-    wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont")));
+    wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));

 
 

-    if (sysfont.Ok())
+    if (font.Ok())

     {
     {

-        if (hasSize)
-            sysfont.SetPointSize(isize);
+        if (hasSize && isize != -1)
+            font.SetPointSize(isize);

         else if (HasParam(wxT("relativesize")))
         else if (HasParam(wxT("relativesize")))

-            sysfont.SetPointSize(int(sysfont.GetPointSize() *
+            font.SetPointSize(int(font.GetPointSize() *

                                      GetFloat(wxT("relativesize"))));
 
         if (hasStyle)
                                      GetFloat(wxT("relativesize"))));
 
         if (hasStyle)

-            sysfont.SetStyle(istyle);
+            font.SetStyle(istyle);

         if (hasWeight)
         if (hasWeight)

-            sysfont.SetWeight(iweight);
+            font.SetWeight(iweight);

         if (hasUnderlined)
         if (hasUnderlined)

-            sysfont.SetUnderlined(underlined);
+            font.SetUnderlined(underlined);

         if (hasFamily)
         if (hasFamily)

-            sysfont.SetFamily(ifamily);
+            font.SetFamily(ifamily);

         if (hasFacename)
         if (hasFacename)

-            sysfont.SetFaceName(facename);
+            font.SetFaceName(facename);

         if (hasEncoding)
         if (hasEncoding)

-            sysfont.SetDefaultEncoding(enc);
-
-        m_node = oldnode;
-        return sysfont;
+            font.SetDefaultEncoding(enc);
+    }
+    else // not based on system font
+    {
+        font = wxFont(isize == -1 ? wxNORMAL_FONT->GetPointSize() : isize,
+                      ifamily, istyle, iweight,
+                      underlined, facename, enc);

     }
 
     m_node = oldnode;
     }
 
     m_node = oldnode;

-    return wxFont(isize, ifamily, istyle, iweight,
-                  underlined, facename, enc);
+    return font;

 }
 
 
 }
 
 


@@ -1471,7 +1548,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;
 


@@ -1495,7 +1572,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
     {


@@ -1516,7 +1593,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;
 


@@ -1526,7 +1604,7 @@ static void AddStdXRCID_Records();
         AddStdXRCID_Records();
     }
 
         AddStdXRCID_Records();
     }
 

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

 }
 
 
 }
 
 


@@ -1569,6 +1647,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);