Fix a crash in wxExecute() in wxMSW too.

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

diff --git a/utils/ifacecheck/src/xmlparser.h b/utils/ifacecheck/src/xmlparser.h
index 7f0cf3e3c2142ac21eb247678b3b9cc61fc5674e..f491bf0b0824e93480532f352bf11be83c4a47d3 100644 (file)
--- a/utils/ifacecheck/src/xmlparser.h
+++ b/utils/ifacecheck/src/xmlparser.h
@@ -16,6 +16,7 @@
 #include <wx/dynarray.h>
 #include <wx/xml/xml.h>
 #include <wx/platinfo.h>
 #include <wx/dynarray.h>
 #include <wx/xml/xml.h>
 #include <wx/platinfo.h>

+#include <wx/log.h>

 
 
 /*
 
 
 /*


@@ -30,24 +31,8 @@
     // ...fix description...
 */
 
     // ...fix description...
 */
 

-
-
-// helper macros
-#define LogMessage(fmt, ...)   { if (g_bLogEnabled) { wxPrintf(fmt "\n", __VA_ARGS__); fflush(stdout); }}
-#define LogWarning(fmt, ...)   { if (g_bLogEnabled) { wxPrintf(fmt "\n", __VA_ARGS__); fflush(stdout); }}
-#define LogError(fmt, ...)     { if (g_bLogEnabled) { wxPrintf("ERROR: " fmt "\n", __VA_ARGS__); fflush(stdout); }}
-#define wxPrint(str)           { wxPrintf(str); fflush(stdout); }
-
-// enable/disable logging
-extern bool g_bLogEnabled;
-
-class LogNull
-{
-public:
-    LogNull() { g_bLogEnabled = false; }
-    ~LogNull() { g_bLogEnabled = true; }
-};
-
+// NOTE: all messages in this way are printed on the stderr
+//#define wxLogWarning   wxLogMessage

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -213,11 +198,14 @@ public:     // getters
         { return m_retType==wxEmptyType && !m_strName.StartsWith("~"); }
     bool IsDtor() const
         { return m_retType==wxEmptyType && m_strName.StartsWith("~"); }
         { return m_retType==wxEmptyType && !m_strName.StartsWith("~"); }
     bool IsDtor() const
         { return m_retType==wxEmptyType && m_strName.StartsWith("~"); }

+    bool IsOperator() const
+        { return m_strName.StartsWith("operator"); }

 
     bool IsDeprecated() const
         { return m_bDeprecated; }
 
 
 
     bool IsDeprecated() const
         { return m_bDeprecated; }
 
 

+

 public:     // setters
 
     void SetReturnType(const wxType& t)
 public:     // setters
 
     void SetReturnType(const wxType& t)


@@ -263,6 +251,7 @@ public:     // misc
     // argument, thus is able to act also as default ctor
     bool ActsAsDefaultCtor() const;
 
     // argument, thus is able to act also as default ctor
     bool ActsAsDefaultCtor() const;
 

+    // dumps the contents of this class in the given stream

     void Dump(wxTextOutputStream& stream) const;
 
 protected:
     void Dump(wxTextOutputStream& stream) const;
 
 protected:


@@ -441,9 +430,10 @@ public:
     wxClassPtrArray FindClassesDefinedIn(const wxString& headerfile) const;
 
     void ShowProgress()
     wxClassPtrArray FindClassesDefinedIn(const wxString& headerfile) const;
 
     void ShowProgress()

-        { /*wxPrint(".");*/ }
+        { /*wxFprintf(stderr, ".");*/ }

 
 

-    bool CheckParseResults() const;
+    // is this interface coherent?
+    bool CheckConsistency() const;

 
 protected:
     wxClassArray m_classes;
 
 protected:
     wxClassArray m_classes;