fixed bug in generation of thumb scroll events

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

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index ade30b60395046eb4a00322f81af7f1908ca1fba..33a33edc34ddc720bcb6bbac9bdf577909e500a7 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -100,9 +100,9 @@ bool wxXmlResource::Load(const wxString& filemask)
     {
 #if wxUSE_FILESYSTEM
         if (filemask.Lower().Matches(wxT("*.zip")) ||
     {
 #if wxUSE_FILESYSTEM
         if (filemask.Lower().Matches(wxT("*.zip")) ||

-            filemask.Lower().Matches(wxT("*.rsc")))
+            filemask.Lower().Matches(wxT("*.xrs")))

         {
         {

-            rt = rt && Load(fnd + wxT("#zip:*.xmb"));
+            rt = rt && Load(fnd + wxT("#zip:*.xmlbin"));

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


@@ -286,6 +286,17 @@ void wxXmlResource::UpdateResources()
     wxFileSystem fsys;
 #   endif
 
     wxFileSystem fsys;
 #   endif
 

+    wxString encoding(wxT("UTF-8"));
+#if !wxUSE_UNICODE && wxUSE_INTL
+    if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
+    {
+        // In case we are not using wxLocale to translate strings, convert the strings
+        // GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because
+        // it could break wxGetTranslation lookup.
+        encoding = wxLocale::GetSystemEncodingName();
+    }
+#endif
+

     for (size_t i = 0; i < m_data.GetCount(); i++)
     {
         modif = (m_data[i].Doc == NULL);
     for (size_t i = 0; i < m_data.GetCount(); i++)
     {
         modif = (m_data[i].Doc == NULL);


@@ -305,7 +316,7 @@ void wxXmlResource::UpdateResources()
 
         if (modif)
         {
 
         if (modif)
         {

-                       wxInputStream *stream = NULL;
+            wxInputStream *stream = NULL;

 
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);
 
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);


@@ -320,9 +331,10 @@ void wxXmlResource::UpdateResources()
                 delete m_data[i].Doc;
                 m_data[i].Doc = new wxXmlDocument;
             }
                 delete m_data[i].Doc;
                 m_data[i].Doc = new wxXmlDocument;
             }

-            if (!stream || !m_data[i].Doc->Load(*stream))
+            if (!stream || !m_data[i].Doc->Load(*stream, encoding))

             {
             {

-                wxLogError(_("Cannot load resources from file '%s'."), m_data[i].File.c_str());
+                wxLogError(_("Cannot load resources from file '%s'."),
+                           m_data[i].File.c_str());

                 wxDELETE(m_data[i].Doc);
             }
             else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
                 wxDELETE(m_data[i].Doc);
             }
             else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))


@@ -360,9 +372,9 @@ void wxXmlResource::UpdateResources()
 }
 
 
 }
 
 

-wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, 
-                                         const wxString& name, 
-                                         const wxString& classname, 
+wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
+                                         const wxString& name,
+                                         const wxString& classname,

                                          bool recursive)
 {
     wxString dummy;
                                          bool recursive)
 {
     wxString dummy;


@@ -372,10 +384,10 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
     // where the resource is most commonly looked for):
     for (node = parent->GetChildren(); node; node = node->GetNext())
     {
     // where the resource is most commonly looked for):
     for (node = parent->GetChildren(); node; node = node->GetNext())
     {

-        if ( node->GetType() == wxXML_ELEMENT_NODE && 
-                 (node->GetName() == wxT("object") || 
+        if ( node->GetType() == wxXML_ELEMENT_NODE &&
+                 (node->GetName() == wxT("object") ||

                   node->GetName() == wxT("object_ref")) &&
                   node->GetName() == wxT("object_ref")) &&

-                (!classname || 
+                (!classname ||

                  node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
                 node->GetPropVal(wxT("name"), &dummy) && dummy == name )
             return node;
                  node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
                 node->GetPropVal(wxT("name"), &dummy) && dummy == name )
             return node;


@@ -384,8 +396,8 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
     if ( recursive )
         for (node = parent->GetChildren(); node; node = node->GetNext())
         {
     if ( recursive )
         for (node = parent->GetChildren(); node; node = node->GetNext())
         {

-            if ( node->GetType() == wxXML_ELEMENT_NODE && 
-                 (node->GetName() == wxT("object") || 
+            if ( node->GetType() == wxXML_ELEMENT_NODE &&
+                 (node->GetName() == wxT("object") ||

                   node->GetName() == wxT("object_ref")) )
             {
                 wxXmlNode* found = DoFindResource(node, name, classname, TRUE);
                   node->GetName() == wxT("object_ref")) )
             {
                 wxXmlNode* found = DoFindResource(node, name, classname, TRUE);


@@ -397,7 +409,7 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
    return NULL;
 }
 
    return NULL;
 }
 

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

                                        const wxString& classname,
                                        bool recursive)
 {
                                        const wxString& classname,
                                        bool recursive)
 {


@@ -409,7 +421,7 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name,
         if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
             continue;
 
         if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
             continue;
 

-        wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(), 
+        wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),

                                           name, classname, recursive);
         if ( found )
         {
                                           name, classname, recursive);
         if ( found )
         {


@@ -433,7 +445,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         wxXmlProperty *dprop;
         for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext())
         {
         wxXmlProperty *dprop;
         for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext())
         {

-       
+

             if ( dprop->GetName() == prop->GetName() )
             {
                 dprop->SetValue(prop->GetValue());
             if ( dprop->GetName() == prop->GetName() )
             {
                 dprop->SetValue(prop->GetValue());


@@ -482,7 +494,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
 
         if ( !refNode )
         {
 
         if ( !refNode )
         {

-            wxLogError(_("Referenced object node with ref=\"%s\" not found!"), 
+            wxLogError(_("Referenced object node with ref=\"%s\" not found!"),

                        refName.c_str());
             return NULL;
         }
                        refName.c_str());
             return NULL;
         }


@@ -531,7 +543,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
 
     m_instance = instance;
     wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
 
     m_instance = instance;

-    if (!m_instance && node->HasProp(wxT("subclass")) && 
+    if (!m_instance && node->HasProp(wxT("subclass")) &&

         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {
         wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {
         wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);


@@ -539,7 +551,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
 
         if (classInfo)
             m_instance = classInfo->CreateObject();
 
         if (classInfo)
             m_instance = classInfo->CreateObject();

-        
+

         if (!m_instance)
         {
             wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
         if (!m_instance)
         {
             wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),


@@ -619,21 +631,16 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
 
 
 
 
 

-wxString wxXmlResourceHandler::GetText(const wxString& param)
+wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)

 {
 {

-    wxString str1;
+    wxString str1(GetParamValue(param));

     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 
     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
 

-    if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-        str1 = wxGetTranslation(GetParamValue(param));
-    else
-        str1 = GetParamValue(param);
-
-    // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
-    //     but later I realized that '_' fits this purpose much better (because
-    //     &File means "File with F underlined").
+    // VS: First version of XRC resources used $ instead of & (which is
+    //     illegal in XML), but later I realized that '_' fits this purpose
+    //     much better (because &File means "File with F underlined").

     if (m_resource->CompareVersion(2,3,0,1) < 0)
         amp_char = wxT('$');
     else
     if (m_resource->CompareVersion(2,3,0,1) < 0)
         amp_char = wxT('$');
     else


@@ -661,8 +668,12 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
             }
         else str2 << *dt;
     }
             }
         else str2 << *dt;
     }

-    
-    return str2;
+
+    if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
+        return wxGetTranslation(str2);
+    else
+        return str2;
+

 }
 
 
 }
 
 


@@ -701,7 +712,7 @@ int wxXmlResourceHandler::GetID()
     stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
     stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
 #undef stdID
     stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
     stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
 #undef stdID

-    else return wxXmlResource::GetXMLID(sid);
+    else return wxXmlResource::GetXRCID(sid);

 }
 
 
 }
 
 


@@ -764,7 +775,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);

-    return img.ConvertToBitmap();
+    return wxBitmap(img);

 }
 
 
 }
 
 


@@ -1030,32 +1041,32 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *
 
 
 
 
 
 

-// --------------- XMLID implementation -----------------------------
+// --------------- XRCID implementation -----------------------------

 
 

-#define XMLID_TABLE_SIZE     1024
+#define XRCID_TABLE_SIZE     1024

 
 
 
 

-struct XMLID_record
+struct XRCID_record

 {
     int id;
     wxChar *key;
 {
     int id;
     wxChar *key;

-    XMLID_record *next;
+    XRCID_record *next;

 };
 
 };
 

-static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
+static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};

 
 

-/*static*/ int wxXmlResource::GetXMLID(const wxChar *str_id)
+/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)

 {
 {

-    static int XMLID_LastID = wxID_HIGHEST;
+    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;

-    index %= XMLID_TABLE_SIZE;
+    index %= XRCID_TABLE_SIZE;

 
 

-    XMLID_record *oldrec = NULL;
+    XRCID_record *oldrec = NULL;

     int matchcnt = 0;
     int matchcnt = 0;

-    for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
+    for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)

     {
         if (wxStrcmp(rec->key, str_id) == 0)
         {
     {
         if (wxStrcmp(rec->key, str_id) == 0)
         {


@@ -1065,10 +1076,10 @@ static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
         oldrec = rec;
     }
 
         oldrec = rec;
     }
 

-    XMLID_record **rec_var = (oldrec == NULL) ?
-                              &XMLID_Records[index] : &oldrec->next;
-    *rec_var = new XMLID_record;
-    (*rec_var)->id = ++XMLID_LastID;
+    XRCID_record **rec_var = (oldrec == NULL) ?
+                              &XRCID_Records[index] : &oldrec->next;
+    *rec_var = new XRCID_record;
+    (*rec_var)->id = ++XRCID_LastID;

     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 


@@ -1076,20 +1087,20 @@ static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
 }
 
 
 }
 
 

-static void CleanXMLID_Record(XMLID_record *rec)
+static void CleanXRCID_Record(XRCID_record *rec)

 {
     if (rec)
     {
 {
     if (rec)
     {

-        CleanXMLID_Record(rec->next);
+        CleanXRCID_Record(rec->next);

         free(rec->key);
         delete rec;
     }
 }
 
         free(rec->key);
         delete rec;
     }
 }
 

-static void CleanXMLID_Records()
+static void CleanXRCID_Records()

 {
 {

-    for (int i = 0; i < XMLID_TABLE_SIZE; i++)
-        CleanXMLID_Record(XMLID_Records[i]);
+    for (int i = 0; i < XRCID_TABLE_SIZE; i++)
+        CleanXRCID_Record(XRCID_Records[i]);

 }
 
 
 }
 
 


@@ -1113,7 +1124,7 @@ public:
     void OnExit()
     {
         delete wxXmlResource::Set(NULL);
     void OnExit()
     {
         delete wxXmlResource::Set(NULL);

-        CleanXMLID_Records();
+        CleanXRCID_Records();

     }
 };
 
     }
 };