hack to _really_ fix crashes in comctl32.dll when processing HDN_GETDISPINFO

[wxWidgets.git] / utils / HelpGen / src / srcparser.cpp

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index 81d84ed431568a3b8632028e8b6d5acf548728fc..b0c12f40f4112926274ce8e6ce37874f7209e9bf 100644 (file)
--- a/utils/HelpGen/src/srcparser.cpp
+++ b/utils/HelpGen/src/srcparser.cpp
@@ -10,8 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "srcparser.h"
-#pragma interface
+#  pragma implementation "srcparser.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -25,7 +24,9 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <malloc.h>
+#ifndef __DARWIN__
+#  include <malloc.h>
+#endif

 #include <stdio.h>
 
 #include "srcparser.h"
 #include <stdio.h>
 
 #include "srcparser.h"


@@ -345,7 +346,7 @@ void spContext::RemoveThisContext()
         mpParent->RemoveChild( this );
     else
         // context should have a parent
         mpParent->RemoveChild( this );
     else
         // context should have a parent

-        wxASSERT(0);
+        wxFAIL_MSG("Context should have a parent");

 }
 
 spContext* spContext::GetOutterContext()
 }
 
 spContext* spContext::GetOutterContext()