fix (harmless) VC7 warnings about auto_ptr assignment

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 3a6cbefc6bf3d4b5e31e428c9a3a51d7e9675076..bd6c432084c198afc52744fa24cdaf87783fb2ef 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -164,10 +164,6 @@ bool wxXmlResource::IsArchive(const wxString& filename)
 
 bool wxXmlResource::Load(const wxString& filemask)
 {
 
 bool wxXmlResource::Load(const wxString& filemask)
 {

-    wxString fnd;
-    bool iswild = wxIsWild(filemask);
-    bool rt = true;
-

 #if wxUSE_FILESYSTEM
     wxFileSystem fsys;
 #   define wxXmlFindFirst  fsys.FindFirst(filemask, wxFILE)
 #if wxUSE_FILESYSTEM
     wxFileSystem fsys;
 #   define wxXmlFindFirst  fsys.FindFirst(filemask, wxFILE)


@@ -176,10 +172,13 @@ bool wxXmlResource::Load(const wxString& filemask)
 #   define wxXmlFindFirst  wxFindFirstFile(filemask, wxFILE)
 #   define wxXmlFindNext   wxFindNextFile()
 #endif
 #   define wxXmlFindFirst  wxFindFirstFile(filemask, wxFILE)
 #   define wxXmlFindNext   wxFindNextFile()
 #endif

-    if (iswild)
-        fnd = wxXmlFindFirst;
-    else
-        fnd = filemask;
+    wxString fnd = wxXmlFindFirst;
+    if ( fnd.empty() )
+    {
+        wxLogError(_("Cannot load resources from '%s'."), filemask);
+        return false;
+    }
+

     while (!fnd.empty())
     {
         fnd = ConvertFileNameToURL(fnd);
     while (!fnd.empty())
     {
         fnd = ConvertFileNameToURL(fnd);


@@ -187,7 +186,8 @@ bool wxXmlResource::Load(const wxString& filemask)
 #if wxUSE_FILESYSTEM
         if ( IsArchive(fnd) )
         {
 #if wxUSE_FILESYSTEM
         if ( IsArchive(fnd) )
         {

-            rt = rt && Load(fnd + wxT("#zip:*.xrc"));
+            if ( !Load(fnd + wxT("#zip:*.xrc")) )
+                return false;

         }
         else // a single resource URL
 #endif // wxUSE_FILESYSTEM
         }
         else // a single resource URL
 #endif // wxUSE_FILESYSTEM


@@ -197,14 +197,12 @@ bool wxXmlResource::Load(const wxString& filemask)
             Data().push_back(drec);
         }
 
             Data().push_back(drec);
         }
 

-        if (iswild)
-            fnd = wxXmlFindNext;
-        else
-            fnd = wxEmptyString;
+        fnd = wxXmlFindNext;

     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext
     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext

-    return rt && UpdateResources();
+
+    return UpdateResources();

 }
 
 bool wxXmlResource::Unload(const wxString& filename)
 }
 
 bool wxXmlResource::Unload(const wxString& filename)


@@ -1627,6 +1625,20 @@ int wxXmlResource::DoGetXRCID(const char *str_id, int value_if_not_found)
     return XRCID_Lookup(str_id, value_if_not_found);
 }
 
     return XRCID_Lookup(str_id, value_if_not_found);
 }
 

+/* static */
+wxString wxXmlResource::FindXRCIDById(int numId)
+{
+    for ( int i = 0; i < XRCID_TABLE_SIZE; i++ )
+    {
+        for ( XRCID_record *rec = XRCID_Records[i]; rec; rec = rec->next )
+        {
+            if ( rec->id == numId )
+                return wxString(rec->key);
+        }
+    }
+
+    return wxString();
+}

 
 static void CleanXRCID_Record(XRCID_record *rec)
 {
 
 static void CleanXRCID_Record(XRCID_record *rec)
 {