docopydocs is not needed for this script.

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index c02b81d49632d64127d27d03a99568cf9aaa7356..ea902a5407763cb467c002890556dba5897765f8 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


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xmlres.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,7 +15,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
+
+#include "wx/xrc/xmlres.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#ifndef __WXWINCE__
+    #include <locale.h>
+#endif

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


@@ -27,8 +34,6 @@
 #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/module.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/module.h"


@@ -36,12 +41,12 @@
 #include "wx/image.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"
 #include "wx/image.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"
 
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
+WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords)

 
 
 wxXmlResource *wxXmlResource::ms_instance = NULL;
 
 
 wxXmlResource *wxXmlResource::ms_instance = NULL;


@@ -79,6 +84,46 @@ wxXmlResource::~wxXmlResource()
 }
 
 
 }
 
 

+/* static */
+wxString wxXmlResource::ConvertFileNameToURL(const wxString& filename)
+{
+    wxString fnd(filename);
+
+    // NB: as Load() and Unload() accept both filenames and URLs (should
+    //     probably be changed to filenames only, but embedded resources
+    //     currently rely on its ability to handle URLs - FIXME) we need to
+    //     determine whether found name is filename and not URL and this is the
+    //     fastest/simplest way to do it
+    if (wxFileName::FileExists(fnd))
+    {
+        // Make the name absolute filename, because the app may
+        // change working directory later:
+        wxFileName fn(fnd);
+        if (fn.IsRelative())
+        {
+            fn.MakeAbsolute();
+            fnd = fn.GetFullPath();
+        }
+#if wxUSE_FILESYSTEM
+        fnd = wxFileSystem::FileNameToURL(fnd);
+#endif
+    }
+
+    return fnd;
+}
+
+#if wxUSE_FILESYSTEM
+
+/* static */
+bool wxXmlResource::IsArchive(const wxString& filename)
+{
+    const wxString fnd = filename.Lower();
+
+    return fnd.Matches(wxT("*.zip")) || fnd.Matches(wxT("*.xrs"));
+}
+
+#endif // wxUSE_FILESYSTEM
+

 bool wxXmlResource::Load(const wxString& filemask)
 {
     wxString fnd;
 bool wxXmlResource::Load(const wxString& filemask)
 {
     wxString fnd;


@@ -98,36 +143,17 @@ bool wxXmlResource::Load(const wxString& filemask)
         fnd = wxXmlFindFirst;
     else
         fnd = filemask;
         fnd = wxXmlFindFirst;
     else
         fnd = filemask;

-    while (!!fnd)
+    while (!fnd.empty())

     {
     {

-        // NB: Load() accepts both filenames and URLs (should probably be
-        //     changed to filenames only, but embedded resources currently
-        //     rely on its ability to handle URLs - FIXME). This check
-        //     serves as a quick way to determine whether found name is
-        //     filename and not URL:
-        if (wxFileName::FileExists(fnd))
-        {
-            // Make the name absolute filename, because the app may
-            // change working directory later:
-            wxFileName fn(fnd);
-            if (fn.IsRelative())
-            {
-                fn.MakeAbsolute();
-                fnd = fn.GetFullPath();
-            }
-#if wxUSE_FILESYSTEM
-            fnd = wxFileSystem::FileNameToURL(fnd);
-#endif
-        }
+        fnd = ConvertFileNameToURL(fnd);

 
 #if wxUSE_FILESYSTEM
 
 #if wxUSE_FILESYSTEM

-        if (fnd.Lower().Matches(wxT("*.zip")) ||
-            fnd.Lower().Matches(wxT("*.xrs")))
+        if ( IsArchive(fnd) )

         {
             rt = rt && Load(fnd + wxT("#zip:*.xrc"));
         }
         {
             rt = rt && Load(fnd + wxT("#zip:*.xrc"));
         }

-        else
-#endif
+        else // a single resource URL
+#endif // wxUSE_FILESYSTEM

         {
             drec = new wxXmlResourceDataRecord;
             drec->File = fnd;
         {
             drec = new wxXmlResourceDataRecord;
             drec->File = fnd;


@@ -144,6 +170,46 @@ bool wxXmlResource::Load(const wxString& filemask)
     return rt && UpdateResources();
 }
 
     return rt && UpdateResources();
 }
 

+bool wxXmlResource::Unload(const wxString& filename)
+{
+    wxASSERT_MSG( !wxIsWild(filename),
+                    _T("wildcards not supported by wxXmlResource::Unload()") );
+
+    wxString fnd = ConvertFileNameToURL(filename);
+#if wxUSE_FILESYSTEM
+    const bool isArchive = IsArchive(fnd);
+    if ( isArchive )
+        fnd += _T("#zip:");
+#endif // wxUSE_FILESYSTEM
+
+    bool unloaded = false;
+    const size_t count = m_data.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+#if wxUSE_FILESYSTEM
+        if ( isArchive )
+        {
+            if ( m_data[i].File.StartsWith(fnd) )
+                unloaded = true;
+            // don't break from the loop, we can have other matching files
+        }
+        else // a single resource URL
+#endif // wxUSE_FILESYSTEM
+        {
+            if ( m_data[i].File == fnd )
+            {
+                m_data.RemoveAt(i);
+                unloaded = true;
+
+                // no sense in continuing, there is only one file with this URL
+                break;
+            }
+        }
+    }
+
+    return unloaded;
+}
+

 
 IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
 


@@ -349,7 +415,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());


@@ -357,9 +427,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)


@@ -415,11 +489,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


@@ -553,7 +629,18 @@ 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() )


@@ -617,7 +704,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);

-WX_DEFINE_LIST(wxXmlSubclassFactoriesList);
+WX_DEFINE_LIST(wxXmlSubclassFactoriesList)

 
 wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
 
 
 wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
 


@@ -649,10 +736,9 @@ public:
 
 
 
 
 
 

-

 wxXmlResourceHandler::wxXmlResourceHandler()
         : m_node(NULL), m_parent(NULL), m_instance(NULL),
 wxXmlResourceHandler::wxXmlResourceHandler()
         : m_node(NULL), m_parent(NULL), m_instance(NULL),

-          m_parentAsWindow(NULL), m_instanceAsWindow(NULL)
+          m_parentAsWindow(NULL)

 {}
 
 
 {}
 
 


@@ -662,7 +748,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     wxXmlNode *myNode = m_node;
     wxString myClass = m_class;
     wxObject *myParent = m_parent, *myInstance = m_instance;
     wxXmlNode *myNode = m_node;
     wxString myClass = m_class;
     wxObject *myParent = m_parent, *myInstance = m_instance;

-    wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
+    wxWindow *myParentAW = m_parentAsWindow;

 
     m_instance = instance;
     if (!m_instance && node->HasProp(wxT("subclass")) &&
 
     m_instance = instance;
     if (!m_instance && node->HasProp(wxT("subclass")) &&


@@ -692,14 +778,13 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     m_class = node->GetPropVal(wxT("class"), wxEmptyString);
     m_parent = parent;
     m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
     m_class = node->GetPropVal(wxT("class"), wxEmptyString);
     m_parent = parent;
     m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);

-    m_instanceAsWindow = wxDynamicCast(m_instance, wxWindow);

 
     wxObject *returned = DoCreateResource();
 
     m_node = myNode;
     m_class = myClass;
     m_parent = myParent; m_parentAsWindow = myParentAW;
 
     wxObject *returned = DoCreateResource();
 
     m_node = myNode;
     m_class = myClass;
     m_parent = myParent; m_parentAsWindow = myParentAW;

-    m_instance = myInstance; m_instanceAsWindow = myInstanceAW;
+    m_instance = myInstance;

 
     return returned;
 }
 
     return returned;
 }


@@ -716,17 +801,23 @@ 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(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(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_BLOCK_EVENTS);

+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

 }
 
 
 }
 
 


@@ -788,14 +879,34 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
             else
                 str2 << wxT('&') << *dt;
         }
             else
                 str2 << wxT('&') << *dt;
         }

-        // Remap \n to CR, \r to LF, \t to TAB:
+        // Remap \n to CR, \r to LF, \t to TAB, \\ to \:

         else if (*dt == wxT('\\'))
             switch (*(++dt))
             {
         else if (*dt == wxT('\\'))
             switch (*(++dt))
             {

-                case wxT('n') : str2 << wxT('\n'); break;
-                case wxT('t') : str2 << wxT('\t'); break;
-                case wxT('r') : str2 << wxT('\r'); break;
-                default       : str2 << wxT('\\') << *dt; break;
+                case wxT('n'):
+                    str2 << wxT('\n');
+                    break;
+
+                case wxT('t'):
+                    str2 << wxT('\t');
+                    break;
+
+                case wxT('r'):
+                    str2 << wxT('\r');
+                    break;
+
+                case wxT('\\') :
+                    // "\\" wasn't translated to "\" prior to 2.5.3.0:
+                    if (m_resource->CompareVersion(2,5,3,0) >= 0)
+                    {
+                        str2 << wxT('\\');
+                        break;
+                    }
+                    // else fall-through to default: branch below
+
+                default:
+                    str2 << wxT('\\') << *dt;
+                    break;

             }
         else str2 << *dt;
     }
             }
         else str2 << *dt;
     }


@@ -818,13 +929,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 #endif
         }
     }
 #endif
         }
     }

-    else
-    {
-        // If wxXRC_USE_LOCALE is not set, then the string is already in
-        // system's default encoding in ANSI build, so we don't have to
-        // do anything special here.
-        return str2;
-    }
+
+    // If wxXRC_USE_LOCALE is not set, then the string is already in
+    // system's default encoding in ANSI build, so we don't have to
+    // do anything special here.
+    return str2;

 }
 
 
 }
 
 


@@ -840,6 +949,24 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv)
     return value;
 }
 
     return value;
 }
 

+float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
+{
+    double value;
+    wxString str1 = GetParamValue(param);
+
+#ifndef __WXWINCE__
+    const char *prevlocale = setlocale(LC_NUMERIC, "C");
+#endif
+
+    if (!str1.ToDouble(&value))
+        value = defaultv;
+
+#ifndef __WXWINCE__
+    setlocale(LC_NUMERIC, prevlocale);
+#endif
+
+    return wx_truncate_cast(float, value);
+}

 
 
 int wxXmlResourceHandler::GetID()
 
 
 int wxXmlResourceHandler::GetID()


@@ -861,27 +988,80 @@ bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv)
     wxString v = GetParamValue(param);
     v.MakeLower();
     if (!v) return defaultv;
     wxString v = GetParamValue(param);
     v.MakeLower();
     if (!v) return defaultv;

-    else return (v == wxT("1"));
+
+    return (v == wxT("1"));

 }
 
 
 }
 
 

+static wxColour GetSystemColour(const wxString& name)
+{
+    if (!name.empty())
+    {
+        #define SYSCLR(clr) \
+            if (name == _T(#clr)) return wxSystemSettings::GetColour(clr);
+        SYSCLR(wxSYS_COLOUR_SCROLLBAR)
+        SYSCLR(wxSYS_COLOUR_BACKGROUND)
+        SYSCLR(wxSYS_COLOUR_DESKTOP)
+        SYSCLR(wxSYS_COLOUR_ACTIVECAPTION)
+        SYSCLR(wxSYS_COLOUR_INACTIVECAPTION)
+        SYSCLR(wxSYS_COLOUR_MENU)
+        SYSCLR(wxSYS_COLOUR_WINDOW)
+        SYSCLR(wxSYS_COLOUR_WINDOWFRAME)
+        SYSCLR(wxSYS_COLOUR_MENUTEXT)
+        SYSCLR(wxSYS_COLOUR_WINDOWTEXT)
+        SYSCLR(wxSYS_COLOUR_CAPTIONTEXT)
+        SYSCLR(wxSYS_COLOUR_ACTIVEBORDER)
+        SYSCLR(wxSYS_COLOUR_INACTIVEBORDER)
+        SYSCLR(wxSYS_COLOUR_APPWORKSPACE)
+        SYSCLR(wxSYS_COLOUR_HIGHLIGHT)
+        SYSCLR(wxSYS_COLOUR_HIGHLIGHTTEXT)
+        SYSCLR(wxSYS_COLOUR_BTNFACE)
+        SYSCLR(wxSYS_COLOUR_3DFACE)
+        SYSCLR(wxSYS_COLOUR_BTNSHADOW)
+        SYSCLR(wxSYS_COLOUR_3DSHADOW)
+        SYSCLR(wxSYS_COLOUR_GRAYTEXT)
+        SYSCLR(wxSYS_COLOUR_BTNTEXT)
+        SYSCLR(wxSYS_COLOUR_INACTIVECAPTIONTEXT)
+        SYSCLR(wxSYS_COLOUR_BTNHIGHLIGHT)
+        SYSCLR(wxSYS_COLOUR_BTNHILIGHT)
+        SYSCLR(wxSYS_COLOUR_3DHIGHLIGHT)
+        SYSCLR(wxSYS_COLOUR_3DHILIGHT)
+        SYSCLR(wxSYS_COLOUR_3DDKSHADOW)
+        SYSCLR(wxSYS_COLOUR_3DLIGHT)
+        SYSCLR(wxSYS_COLOUR_INFOTEXT)
+        SYSCLR(wxSYS_COLOUR_INFOBK)
+        SYSCLR(wxSYS_COLOUR_LISTBOX)
+        SYSCLR(wxSYS_COLOUR_HOTLIGHT)
+        SYSCLR(wxSYS_COLOUR_GRADIENTACTIVECAPTION)
+        SYSCLR(wxSYS_COLOUR_GRADIENTINACTIVECAPTION)
+        SYSCLR(wxSYS_COLOUR_MENUHILIGHT)
+        SYSCLR(wxSYS_COLOUR_MENUBAR)
+        #undef SYSCLR
+    }
+
+    return wxNullColour;
+}

 
 wxColour wxXmlResourceHandler::GetColour(const wxString& param)
 {
     wxString v = GetParamValue(param);
 
 wxColour wxXmlResourceHandler::GetColour(const wxString& param)
 {
     wxString v = GetParamValue(param);

-    unsigned long tmp = 0;
+    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:
+        clr = GetSystemColour(v);
+        if (clr.Ok())
+            return clr;
+

         wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
                    v.c_str(), param.c_str());
         return wxNullColour;
     }
 
         wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
                    v.c_str(), param.c_str());
         return wxNullColour;
     }
 

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

 }
 
 
 }
 
 


@@ -902,7 +1082,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
                 scl = defaultArtClient;
             else
                 scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl);
                 scl = defaultArtClient;
             else
                 scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl);

-            
+

             wxBitmap stockArt =
                 wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
                                          scl, size);
             wxBitmap stockArt =
                 wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
                                          scl, size);


@@ -913,7 +1093,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
 
     /* ...or load the bitmap from file: */
     wxString name = GetParamValue(param);
 
     /* ...or load the bitmap from file: */
     wxString name = GetParamValue(param);

-    if (name.IsEmpty()) return wxNullBitmap;
+    if (name.empty()) return wxNullBitmap;

 #if wxUSE_FILESYSTEM
     wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
     if (fsfile == NULL)
 #if wxUSE_FILESYSTEM
     wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
     if (fsfile == NULL)


@@ -925,17 +1105,17 @@ 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())
     {
 #endif
 
     if (!img.Ok())
     {

-        wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
+        wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
+                   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);

-

 }
 
 
 }
 
 


@@ -987,7 +1167,7 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {

-    if (param.IsEmpty())
+    if (param.empty())

         return GetNodeContent(m_node);
     else
         return GetNodeContent(GetParamNode(param));
         return GetNodeContent(m_node);
     else
         return GetNodeContent(GetParamNode(param));


@@ -995,14 +1175,15 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 
 
 
 
 
 

-wxSize wxXmlResourceHandler::GetSize(const wxString& param)
+wxSize wxXmlResourceHandler::GetSize(const wxString& param,
+                                     wxWindow *windowToUse)

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

-    if (s.IsEmpty()) s = wxT("-1,-1");
+    if (s.empty()) s = wxT("-1,-1");

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


@@ -1014,17 +1195,22 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
 
     if (is_dlg)
     {
 
     if (is_dlg)
     {

-        if (m_instanceAsWindow)
-            return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, sy));
+        if (windowToUse)
+        {
+            return wxDLG_UNIT(windowToUse, wxSize(sx, sy));
+        }

         else if (m_parentAsWindow)
         else if (m_parentAsWindow)

+        {

             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));

+        }

         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return wxDefaultSize;
         }
     }
         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return wxDefaultSize;
         }
     }

-    else return wxSize(sx, sy);
+
+    return wxSize(sx, sy);

 }
 
 
 }
 
 


@@ -1037,14 +1223,16 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param)
 
 
 
 
 
 

-wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv)
+wxCoord wxXmlResourceHandler::GetDimension(const wxString& param,
+                                           wxCoord defaultv,
+                                           wxWindow *windowToUse)

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

-    if (s.IsEmpty()) return defaultv;
+    if (s.empty()) return defaultv;

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


@@ -1055,20 +1243,45 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul
 
     if (is_dlg)
     {
 
     if (is_dlg)
     {

-        if (m_instanceAsWindow)
-            return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, 0)).x;
+        if (windowToUse)
+        {
+            return wxDLG_UNIT(windowToUse, wxSize(sx, 0)).x;
+        }

         else if (m_parentAsWindow)
         else if (m_parentAsWindow)

+        {

             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;
             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;

+        }

         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return defaultv;
         }
     }
         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return defaultv;
         }
     }

-    else return sx;
+
+    return sx;

 }
 
 
 }
 
 

+// Get system font index using indexname
+static wxFont GetSystemFont(const wxString& name)
+{
+    if (!name.empty())
+    {
+        #define SYSFNT(fnt) \
+            if (name == _T(#fnt)) return wxSystemSettings::GetFont(fnt);
+        SYSFNT(wxSYS_OEM_FIXED_FONT)
+        SYSFNT(wxSYS_ANSI_FIXED_FONT)
+        SYSFNT(wxSYS_ANSI_VAR_FONT)
+        SYSFNT(wxSYS_SYSTEM_FONT)
+        SYSFNT(wxSYS_DEVICE_DEFAULT_FONT)
+        SYSFNT(wxSYS_DEFAULT_PALETTE)
+        SYSFNT(wxSYS_SYSTEM_FIXED_FONT)
+        SYSFNT(wxSYS_DEFAULT_GUI_FONT)
+        #undef SYSFNT
+    }
+
+    return wxNullFont;
+}

 
 wxFont wxXmlResourceHandler::GetFont(const wxString& param)
 {
 
 wxFont wxXmlResourceHandler::GetFont(const wxString& param)
 {


@@ -1082,52 +1295,121 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     wxXmlNode *oldnode = m_node;
     m_node = font_node;
 
     wxXmlNode *oldnode = m_node;
     m_node = font_node;
 

-    long size = GetLong(wxT("size"), 12);
+    // font attributes:
+
+    // size
+    int isize = -1;
+    bool hasSize = HasParam(wxT("size"));
+    if (hasSize)
+        isize = GetLong(wxT("size"), -1);
+
+    // style
+    int istyle = wxNORMAL;
+    bool hasStyle = HasParam(wxT("style"));
+    if (hasStyle)
+    {
+        wxString style = GetParamValue(wxT("style"));
+        if (style == wxT("italic"))
+            istyle = wxITALIC;
+        else if (style == wxT("slant"))
+            istyle = wxSLANT;
+    }
+
+    // weight
+    int iweight = wxNORMAL;
+    bool hasWeight = HasParam(wxT("weight"));
+    if (hasWeight)
+    {
+        wxString weight = GetParamValue(wxT("weight"));
+        if (weight == wxT("bold"))
+            iweight = wxBOLD;
+        else if (weight == wxT("light"))
+            iweight = wxLIGHT;
+    }

 
 

-    wxString style = GetParamValue(wxT("style"));
-    wxString weight = GetParamValue(wxT("weight"));
-    int istyle = wxNORMAL, iweight = wxNORMAL;
-    if (style == wxT("italic")) istyle = wxITALIC;
-    else if (style == wxT("slant")) istyle = wxSLANT;
-    if (weight == wxT("bold")) iweight = wxBOLD;
-    else if (weight == wxT("light")) iweight = wxLIGHT;
+    // underline
+    bool hasUnderlined = HasParam(wxT("underlined"));
+    bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false;

 
 

-    wxString family = GetParamValue(wxT("family"));
+    // family and facename

     int ifamily = wxDEFAULT;
     int ifamily = wxDEFAULT;

-         if (family == wxT("decorative")) ifamily = wxDECORATIVE;
-    else if (family == wxT("roman")) ifamily = wxROMAN;
-    else if (family == wxT("script")) ifamily = wxSCRIPT;
-    else if (family == wxT("swiss")) ifamily = wxSWISS;
-    else if (family == wxT("modern")) ifamily = wxMODERN;
+    bool hasFamily = HasParam(wxT("family"));
+    if (hasFamily)
+    {
+        wxString family = GetParamValue(wxT("family"));
+             if (family == wxT("decorative")) ifamily = wxDECORATIVE;
+        else if (family == wxT("roman")) ifamily = wxROMAN;
+        else if (family == wxT("script")) ifamily = wxSCRIPT;
+        else if (family == wxT("swiss")) ifamily = wxSWISS;
+        else if (family == wxT("modern")) ifamily = wxMODERN;
+        else if (family == wxT("teletype")) ifamily = wxTELETYPE;
+    }

 
 

-    bool underlined = GetBool(wxT("underlined"), false);

 
 

-    wxString encoding = GetParamValue(wxT("encoding"));
-    wxFontMapper mapper;
-    wxFontEncoding enc = wxFONTENCODING_DEFAULT;
-    if (!encoding.IsEmpty())
-        enc = mapper.CharsetToEncoding(encoding);
-    if (enc == wxFONTENCODING_SYSTEM)
-        enc = wxFONTENCODING_DEFAULT;
-
-    wxString faces = GetParamValue(wxT("face"));
-    wxString facename = wxEmptyString;
-    wxFontEnumerator enu;
-    enu.EnumerateFacenames();
-    wxStringTokenizer tk(faces, wxT(","));
-    while (tk.HasMoreTokens())
+    wxString facename;
+    bool hasFacename = HasParam(wxT("face"));
+    if (hasFacename)

     {
     {

-        int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
-        if (index != wxNOT_FOUND)
+        wxString faces = GetParamValue(wxT("face"));
+        wxFontEnumerator enu;
+        enu.EnumerateFacenames();
+        wxStringTokenizer tk(faces, wxT(","));
+        while (tk.HasMoreTokens())

         {
         {

-            facename = (*enu.GetFacenames())[index];
-            break;
+            int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
+            if (index != wxNOT_FOUND)
+            {
+                facename = (*enu.GetFacenames())[index];
+                break;
+            }

         }
     }
 
         }
     }
 

-    m_node = oldnode;
+    // encoding
+    wxFontEncoding enc = wxFONTENCODING_DEFAULT;
+    bool hasEncoding = HasParam(wxT("encoding"));
+    if (hasEncoding)
+    {
+        wxString encoding = GetParamValue(wxT("encoding"));
+        wxFontMapper mapper;
+        if (!encoding.empty())
+            enc = mapper.CharsetToEncoding(encoding);
+        if (enc == wxFONTENCODING_SYSTEM)
+            enc = wxFONTENCODING_DEFAULT;
+    }
+
+    // is this font based on a system font?
+    wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));

 
 

-    wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);
+    if (font.Ok())
+    {
+        if (hasSize && isize != -1)
+            font.SetPointSize(isize);
+        else if (HasParam(wxT("relativesize")))
+            font.SetPointSize(int(font.GetPointSize() *
+                                     GetFloat(wxT("relativesize"))));
+
+        if (hasStyle)
+            font.SetStyle(istyle);
+        if (hasWeight)
+            font.SetWeight(iweight);
+        if (hasUnderlined)
+            font.SetUnderlined(underlined);
+        if (hasFamily)
+            font.SetFamily(ifamily);
+        if (hasFacename)
+            font.SetFaceName(facename);
+        if (hasEncoding)
+            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;

     return font;
 }
 
     return font;
 }
 


@@ -1157,6 +1439,8 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 #endif
     if (HasParam(wxT("font")))
         wnd->SetFont(GetFont());
 #endif
     if (HasParam(wxT("font")))
         wnd->SetFont(GetFont());

+    if (HasParam(wxT("help")))
+        wnd->SetHelpText(GetText(wxT("help")));

 }
 
 
 }
 
 


@@ -1215,8 +1499,6 @@ 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 = -2)
 {

-    static int XRCID_LastID = wxID_HIGHEST;
-

     int index = 0;
 
     for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;
     int index = 0;
 
     for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;


@@ -1251,15 +1533,25 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
         }
         else
         {
         }
         else
         {

-            (*rec_var)->id = ++XRCID_LastID;
+            (*rec_var)->id = wxNewId();

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

+static void AddStdXRCID_Records();
+

 /*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
 {
 /*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
 {

+    static bool s_stdIDsAdded = false;
+
+    if ( !s_stdIDsAdded )
+    {
+        s_stdIDsAdded = true;
+        AddStdXRCID_Records();
+    }
+

     return XRCID_Lookup(str_id);
 }
 
     return XRCID_Lookup(str_id);
 }
 


@@ -1290,7 +1582,7 @@ static void AddStdXRCID_Records()
 
     stdID(wxID_ANY);
     stdID(wxID_SEPARATOR);
 
     stdID(wxID_ANY);
     stdID(wxID_SEPARATOR);

-    
+

     stdID(wxID_OPEN);
     stdID(wxID_CLOSE);
     stdID(wxID_NEW);
     stdID(wxID_OPEN);
     stdID(wxID_CLOSE);
     stdID(wxID_NEW);


@@ -1404,7 +1696,6 @@ public:
     wxXmlResourceModule() {}
     bool OnInit()
     {
     wxXmlResourceModule() {}
     bool OnInit()
     {

-        AddStdXRCID_Records();

         wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
         return true;
     }
         wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
         return true;
     }