Fix handling of not fully specified min/max size in wxBoxSizer.

[wxWidgets.git] / utils / ifacecheck / src / xmlparser.cpp

diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp
index 8f46e23c21800789ab526fca1244aa40b781599d..86247d1122a45e215b64ed4dfc0144a0fcb184fa 100644 (file)
--- a/utils/ifacecheck/src/xmlparser.cpp
+++ b/utils/ifacecheck/src/xmlparser.cpp
@@ -760,7 +760,7 @@ bool getID(unsigned long *id, const wxString& str)
 }
 
 // utility specialized to parse efficiently the gccXML list of IDs which occur
 }
 
 // utility specialized to parse efficiently the gccXML list of IDs which occur

-// in nodes like <Class> ones... i.e. numeric values separed by " _" token
+// in nodes like <Class> ones... i.e. numeric values separated by " _" token

 bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxString& str)
 {
     const wxStringCharType * const start = str.wx_str();
 bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxString& str)
 {
     const wxStringCharType * const start = str.wx_str();


@@ -1280,7 +1280,7 @@ bool wxXmlGccInterface::ParseMethod(const wxXmlNode *p,
 
     // NOTE: gccxml is smart enough to mark as virtual those functions
     //       which are declared virtual in base classes but don't have
 
     // NOTE: gccxml is smart enough to mark as virtual those functions
     //       which are declared virtual in base classes but don't have

-    //       the "virtual" keyword explicitely indicated in the derived
+    //       the "virtual" keyword explicitly indicated in the derived

     //       classes... so we don't need any further logic for virtuals
 
     m.SetVirtual(p->GetAttribute("virtual") == "1");
     //       classes... so we don't need any further logic for virtuals
 
     m.SetVirtual(p->GetAttribute("virtual") == "1");


@@ -1529,11 +1529,10 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename)
                             membernode->GetAttribute("kind") == "function" &&
                             (accessSpec == "public" || accessSpec == "protected"))
                         {
                             membernode->GetAttribute("kind") == "function" &&
                             (accessSpec == "public" || accessSpec == "protected"))
                         {

-

                             wxMethod m;
                             if (!ParseMethod(membernode, m, header)) {
                                 wxLogError("The method '%s' could not be added to class '%s'",
                             wxMethod m;
                             if (!ParseMethod(membernode, m, header)) {
                                 wxLogError("The method '%s' could not be added to class '%s'",

-                                         m.GetName(), klass.GetName());
+                                           m.GetName(), klass.GetName());

                                 return false;
                             }
 
                                 return false;
                             }
 


@@ -1548,9 +1547,11 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename)
                                 absoluteFile = header;
                             else if (header != absoluteFile)
                             {
                                 absoluteFile = header;
                             else if (header != absoluteFile)
                             {

-                                wxLogError("The method '%s' is documented in a different "
-                                            "file from others (which belong to '%s') ?",
-                                            header, absoluteFile);
+                                wxLogError("Found inconsistency in the XML file '%s': "
+                                           "the method '%s' is documented in the "
+                                           "file '%s' but the other methods of the same "
+                                           "class are documented in the file '%s'",
+                                            filename, m.GetName(), header, absoluteFile);

                                 return false;
                             }
 
                                 return false;
                             }
 


@@ -1685,7 +1686,7 @@ bool wxXmlDoxygenInterface::ParseMethod(const wxXmlNode* p, wxMethod& m, wxStrin
 
     // NOTE: Doxygen is smart enough to mark as virtual those functions
     //       which are declared virtual in base classes but don't have
 
     // NOTE: Doxygen is smart enough to mark as virtual those functions
     //       which are declared virtual in base classes but don't have

-    //       the "virtual" keyword explicitely indicated in the derived
+    //       the "virtual" keyword explicitly indicated in the derived

     //       classes... so we don't need any further logic for virtuals
 
     m.SetVirtual(p->GetAttribute("virt")=="virtual");
     //       classes... so we don't need any further logic for virtuals
 
     m.SetVirtual(p->GetAttribute("virt")=="virtual");