corrected wxGetWorkingDirectory for mac (stripping last char off)

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 6e59b5aa9ec546c3edccc9483292e0854326d8fc..ef1e2f2761309e848237f3f6663dd6c66fe2b486 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -83,8 +83,8 @@ bool wxXmlResource::Load(const wxString& filemask)
     while (!!fnd)
     {
 #if wxUSE_FILESYSTEM
     while (!!fnd)
     {
 #if wxUSE_FILESYSTEM

-        if (filemask.Lower().Matches("*.zip") ||
-            filemask.Lower().Matches("*.rsc"))
+        if (filemask.Lower().Matches(wxT("*.zip")) ||
+            filemask.Lower().Matches(wxT("*.rsc")))

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


@@ -210,7 +210,7 @@ bool wxXmlResource::AttachUnknownControl(const wxString& name,
 }
 
 
 }
 
 

-void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
+static void ProcessPlatformProperty(wxXmlNode *node)

 {
     wxString s;
     bool isok;
 {
     wxString s;
     bool isok;


@@ -245,14 +245,17 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
         }
 
         if (isok)
         }
 
         if (isok)

+        {

             ProcessPlatformProperty(c);
             ProcessPlatformProperty(c);

+            c = c->GetNext();
+        }

         else
         {
             node->RemoveChild(c);
         else
         {
             node->RemoveChild(c);

+            wxXmlNode *c2 = c->GetNext();

             delete c;
             delete c;

+            c = c2;

         }
         }

-
-        c = c->GetNext();

     }
 }
 
     }
 }
 


@@ -569,7 +572,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 XMLID(sid.c_str());
+    else return wxXmlResource::GetXMLID(sid);

 }
 
 
 }
 
 


@@ -618,7 +621,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
     wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
     if (fsfile == NULL)
     {
     wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
     if (fsfile == NULL)
     {

-        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str());

         return wxNullBitmap;
     }
     wxImage img(*(fsfile->GetStream()));
         return wxNullBitmap;
     }
     wxImage img(*(fsfile->GetStream()));


@@ -628,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
 #endif
     if (!img.Ok())
     {
 #endif
     if (!img.Ok())
     {

-        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str());

         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);


@@ -708,7 +711,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
     if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
         !s.AfterLast(wxT(',')).ToLong(&sy))
     {
     if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
         !s.AfterLast(wxT(',')).ToLong(&sy))
     {

-        wxLogError(_("Cannot parse coordinates from '%s'."), s.mb_str());
+        wxLogError(_("Cannot parse coordinates from '%s'."), s.c_str());

         return wxDefaultSize;
     }
 
         return wxDefaultSize;
     }
 


@@ -749,7 +752,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul
 
     if (!s.ToLong(&sx))
     {
 
     if (!s.ToLong(&sx))
     {

-        wxLogError(_("Cannot parse dimension from '%s'."), s.mb_str());
+        wxLogError(_("Cannot parse dimension from '%s'."), s.c_str());

         return defaultv;
     }
 
         return defaultv;
     }
 


@@ -775,7 +778,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     wxXmlNode *font_node = GetParamNode(param);
     if (font_node == NULL)
     {
     wxXmlNode *font_node = GetParamNode(param);
     if (font_node == NULL)
     {

-        wxLogError(_("Cannot find font node '%s'."), param.mb_str());
+        wxLogError(_("Cannot find font node '%s'."), param.c_str());

         return wxNullFont;
     }
 
         return wxNullFont;
     }
 


@@ -904,26 +907,26 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *
 struct XMLID_record
 {
     int id;
 struct XMLID_record
 {
     int id;

-    char *key;
+    wxChar *key;

     XMLID_record *next;
 };
 
 static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
 
     XMLID_record *next;
 };
 
 static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
 

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

 {
     static int XMLID_LastID = wxID_HIGHEST;
 
     int index = 0;
 
 {
     static int XMLID_LastID = wxID_HIGHEST;
 
     int index = 0;
 

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

     index %= XMLID_TABLE_SIZE;
 
     XMLID_record *oldrec = NULL;
     int matchcnt = 0;
     for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
     {
     index %= XMLID_TABLE_SIZE;
 
     XMLID_record *oldrec = NULL;
     int matchcnt = 0;
     for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
     {

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

         {
             return rec->id;
         }
         {
             return rec->id;
         }


@@ -935,7 +938,7 @@ static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
                               &XMLID_Records[index] : &oldrec->next;
     *rec_var = new XMLID_record;
     (*rec_var)->id = ++XMLID_LastID;
                               &XMLID_Records[index] : &oldrec->next;
     *rec_var = new XMLID_record;
     (*rec_var)->id = ++XMLID_LastID;

-    (*rec_var)->key = strdup(str_id);
+    (*rec_var)->key = wxStrdup(str_id);

     (*rec_var)->next = NULL;
 
     return (*rec_var)->id;
     (*rec_var)->next = NULL;
 
     return (*rec_var)->id;


@@ -947,7 +950,7 @@ static void CleanXMLID_Record(XMLID_record *rec)
     if (rec)
     {
         CleanXMLID_Record(rec->next);
     if (rec)
     {
         CleanXMLID_Record(rec->next);

-        free (rec->key);
+        free(rec->key);

         delete rec;
     }
 }
         delete rec;
     }
 }