Moved the popup menu event handlers to dialog event handler

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

diff --git a/utils/HelpGen/src/ifcontext.cpp b/utils/HelpGen/src/ifcontext.cpp
index be08a59330bd16ee10f427aa486829be49bd5bfd..79f9c72a44ff903a56f7f14cf48d0a63e848a769 100644 (file)
--- a/utils/HelpGen/src/ifcontext.cpp
+++ b/utils/HelpGen/src/ifcontext.cpp
@@ -24,7 +24,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#ifdef HAVE_MALLOC_H
+#ifndef __DARWIN__

 #  include <malloc.h>
 #endif
 #include <stdio.h>
 #  include <malloc.h>
 #endif
 #include <stdio.h>


@@ -35,11 +35,12 @@
 
 size_t spInterFileContext::GetFileNo( const string& fname )
 {
 
 size_t spInterFileContext::GetFileNo( const string& fname )
 {

-       for( size_t i = 0; i != mFiles.size(); ++i )
-
-               if ( fname == mFiles[i] ) return i;
+    size_t i;
+       for ( i = 0; i != mFiles.size(); ++i )
+               if ( fname == mFiles[i] )
+            return i;

 
 

-       wxASSERT(0); // DBG::
+    wxFAIL_MSG("File not found in array in function spInterFileContext::GetFileNo()");

        return 0;
 }
 
        return 0;
 }
 


@@ -119,8 +120,8 @@ void spInterFileContext::DoAppendSourceFragment( string& source,
 
                if ( cur >= pos + len ) // check if we've overstepped the current source-fragment
                {
 
                if ( cur >= pos + len ) // check if we've overstepped the current source-fragment
                {

-                       wxASSERT(0); // DBG:: with current imp. this should not happen
-                       
+//                     wxASSERT(0); // DBG:: with current imp. this should not happen
+            wxFAIL_MSG("Overstepped the current source fragment in function\nspInterFileContext::DoAppendSourceFragment()");                   

                        cur = pos + len; break;
                }
        }
                        cur = pos + len; break;
                }
        }