checked in forgottern parts of MSLU changes

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

diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp
index 6d08955e166a8040980f4f5a4a870ed9f5b92f79..f20a5f675ec8f214d443ee5b3eaa07593614deed 100644 (file)
--- a/utils/HelpGen/src/scriptbinder.cpp
+++ b/utils/HelpGen/src/scriptbinder.cpp
@@ -20,7 +20,9 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

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

 #include <string.h>
 #include <memory.h>
 
 #include <string.h>
 #include <memory.h>
 


@@ -238,7 +240,7 @@ inline void ScriptTemplate::PrintVar( TVarInfo*   pInfo,
                                if ( !sz ) 
                                {
                                        // DBG::
                                if ( !sz ) 
                                {
                                        // DBG::

-                                       int u;
+                                       int u = 0;

                                        ++u;
                                        break;
                                }
                                        ++u;
                                        break;
                                }


@@ -308,7 +310,7 @@ void ScriptTemplate::PrintScript( void* dataObj, ScriptStream& stm )
 
                // variable referred by template script is not
                // registered to this tempalte object
 
                // variable referred by template script is not
                // registered to this tempalte object

-               ASSERT( found ); 
+               // ASSERT( found ); 

 
        } while(1);
 }
 
        } while(1);
 }


@@ -398,7 +400,7 @@ ScriptSection* ScriptSection::GetSubsection( const char* name )
                ++cur;
        }
 
                ++cur;
        }
 

-       ASSERT( cur < sizeof(buf) );
+       // ASSERT( cur < sizeof(buf) );

 
        buf[cur] = '\0';
 
 
        buf[cur] = '\0';
 


@@ -432,7 +434,7 @@ void ScriptSection::AddSection( ScriptSection* pSection,
        pSection->AddRef();
 
        // can add section to multiple containers
        pSection->AddRef();
 
        // can add section to multiple containers

-       ASSERT( pSection->mpParent == 0 );
+       // ASSERT( pSection->mpParent == 0 );

 
        pSection->mpParent = this;
 
 
        pSection->mpParent = this;
 


@@ -602,7 +604,7 @@ bool DocGeneratorBase::SaveDocument( const char*    fname,
        else
        {
                ScriptSection* pTopSect = GetTopSection();
        else
        {
                ScriptSection* pTopSect = GetTopSection();

-               ASSERT( pTopSect );
+               // ASSERT( pTopSect );

                pTopSect->Print( stm );
        }
 
                pTopSect->Print( stm );
        }