corrections for compilation under Mac OS X

removed invalid '#pragma interface' in source files (instead of headers?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/HelpGen/src/.cvsignore

@@ -0,0 +1,5 @@
+HelpGenM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

utils/HelpGen/src/cjparser.cpp

@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 #  pragma implementation "acell.h"
-#pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

utils/HelpGen/src/ifcontext.cpp

@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 #  pragma implementation "ifcontext.h"
-#pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -25,7 +24,9 @@
 #include "wx/wx.h"
 #endif
 
+#ifdef HAVE_MALLOC_H
 #  include <malloc.h>
+#endif
 #include <stdio.h>
 
 #include "ifcontext.h"

utils/HelpGen/src/scriptbinder.cpp

@@ -20,7 +20,9 @@
 #include "wx/wx.h"
 #endif
 
+#ifdef HAVE_MALLOC_H
 #  include <malloc.h>
+#endif
 #include <string.h>
 #include <memory.h>
 

utils/HelpGen/src/sourcepainter.cpp

@@ -21,12 +21,9 @@
 #endif
 
 #if defined( wxUSE_TEMPLATE_STL )
-
 #  include <map>
 #else
-
 #  include "wxstlac.h"
-
 #endif
 
 #include "sourcepainter.h"

utils/HelpGen/src/srcparser.cpp

@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 #  pragma implementation "srcparser.h"
-#pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -25,7 +24,9 @@
 #include "wx/wx.h"
 #endif
 
+#ifdef HAVE_MALLOC_H
 #  include <malloc.h>
+#endif
 #include <stdio.h>
 
 #include "srcparser.h"

utils/HelpGen/src/wxstlac.h

@@ -17,7 +17,9 @@
 #endif
 
 #include <stddef.h>
+#if !defined(__WXMAC__) || defined(__DARWIN__)
 #  include <sys/types.h>
+#endif
 #include <memory.h>
 #include <limits.h>
 #include <new.h>
@@ -599,7 +601,8 @@ public:\
 
 #define ___WXSTL_COMMA ,
 
-#define __DEFINE_MAP(ARG_IS_UNIQUE, KEY_TYPE, VAL_TYPE, FUNCTOR ) __DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\
+#define __DEFINE_MAP(ARG_IS_UNIQUE, KEY_TYPE, VAL_TYPE, FUNCTOR ) \
+__DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\
 FUNCTOR,\
 __WXSTLMAP_##KEY_TYPE##VAL_TYPE##ARG_IS_UNIQUE, \
 struct key_value_pair   { KEY_TYPE first ; \
@@ -626,7 +629,8 @@ inline insert_result_iterator insert( const value_type& x )\
 	return result;\
 } )
 
-#define __DEFINE_SET(ARG_IS_UNIQUE, KEY_TYPE, FUNCTOR ) __DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\
+#define __DEFINE_SET(ARG_IS_UNIQUE, KEY_TYPE, FUNCTOR ) \
+__DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\
 FUNCTOR,\
 __WXSTLSET_##TYPE##ARG_IS_UNIQUE, \
 KEY_TYPE,\

utils/HelpGen/src/wxstllst.h

@@ -17,7 +17,9 @@
 #endif
 
 #include <stddef.h>
+#if !defined(__WXMAC__) || defined(__DARWIN__)
 #  include <sys/types.h>
+#endif
 #include <memory.h>
 #include <limits.h>
 #include <new.h>

utils/HelpGen/src/wxstlvec.h

@@ -19,7 +19,9 @@
 #include <memory.h>
 #include <string.h>  // imports memmove()
 #include <stddef.h>
+#if !defined(__WXMAC__) || defined(__DARWIN__)
 #  include <sys/types.h>
+#endif
 #include <limits.h>
 #include <new>