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

diff --git a/utils/HelpGen/src/.cvsignore b/utils/HelpGen/src/.cvsignore
new file mode 100644 (file)
index 0000000..f581451
--- /dev/null
+++ b/utils/HelpGen/src/.cvsignore
@@ -0,0 +1,5 @@
+HelpGenM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/utils/HelpGen/src/HelpGenM5.mcp b/utils/HelpGen/src/HelpGenM5.mcp
new file mode 100644 (file)
index 0000000..0aba921
Binary files /dev/null and b/utils/HelpGen/src/HelpGenM5.mcp differ

diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index a623a286117664194f21a0746c10b78efe8888a7..1d87c0244962d7e23da019dc4294fedfb901ba03 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -10,8 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

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

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

diff --git a/utils/HelpGen/src/ifcontext.cpp b/utils/HelpGen/src/ifcontext.cpp
index 3b2698a6392fd461804c71f9ba9dd23e66678e66..be08a59330bd16ee10f427aa486829be49bd5bfd 100644 (file)
--- a/utils/HelpGen/src/ifcontext.cpp
+++ b/utils/HelpGen/src/ifcontext.cpp
@@ -10,8 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "ifcontext.h"
-#pragma interface
+#  pragma implementation "ifcontext.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>
+#ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+#endif

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

diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp
index 5ef0e7b0bdce032d86bef6c5d380a7238a9fc2c7..cfdc15fbaf214b976faa0452bee6439a5bd8a00e 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>
+#ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+#endif

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

diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp
index 6814b5ffee11646deda9c4be4a4ce75f0852ca31..487600935830a3f66b1ca9de7ef770705d8bf70a 100644 (file)
--- a/utils/HelpGen/src/sourcepainter.cpp
+++ b/utils/HelpGen/src/sourcepainter.cpp
@@ -21,12 +21,9 @@
 #endif
 
 #if defined( wxUSE_TEMPLATE_STL )
 #endif
 
 #if defined( wxUSE_TEMPLATE_STL )

-
-       #include <map>
+#  include <map>

 #else
 #else

-
-       #include "wxstlac.h"
-
+#  include "wxstlac.h"

 #endif
 
 #include "sourcepainter.h"
 #endif
 
 #include "sourcepainter.h"

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index 81d84ed431568a3b8632028e8b6d5acf548728fc..2875d4404067dbe02e61e8d1173a9da420d2227b 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>
+#ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+#endif

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

diff --git a/utils/HelpGen/src/wxstlac.h b/utils/HelpGen/src/wxstlac.h
index 9f69f1f26d5b8168181046aa1fcb3a09d2253355..f71ef3405dd05511219cb23f2ffb76c59494c623 100644 (file)
--- a/utils/HelpGen/src/wxstlac.h
+++ b/utils/HelpGen/src/wxstlac.h
@@ -17,7 +17,9 @@
 #endif
 
 #include <stddef.h>
 #endif
 
 #include <stddef.h>

-#include <sys/types.h>
+#if !defined(__WXMAC__) || defined(__DARWIN__)
+#  include <sys/types.h>
+#endif

 #include <memory.h>
 #include <limits.h>
 #include <new.h>
 #include <memory.h>
 #include <limits.h>
 #include <new.h>


@@ -599,15 +601,16 @@ public:\
 
 #define ___WXSTL_COMMA ,
 
 
 #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 ; \
 FUNCTOR,\
 __WXSTLMAP_##KEY_TYPE##VAL_TYPE##ARG_IS_UNIQUE, \
 struct key_value_pair   { KEY_TYPE first ; \

-                                                 VAL_TYPE second;\
-                                                 key_value_pair() {}\
-                                                 key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \
-                                                       : first(key) ___WXSTL_COMMA second( value ) {} \
-                                               } , \
+                          VAL_TYPE second;\
+                          key_value_pair() {}\
+                          key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \
+                            : first(key) ___WXSTL_COMMA second( value ) {} \
+                         } , \

 KEY_TYPE,\
 VAL_TYPE,\
 mData.first, mData.second, x.first, x.second, \
 KEY_TYPE,\
 VAL_TYPE,\
 mData.first, mData.second, x.first, x.second, \


@@ -626,7 +629,8 @@ inline insert_result_iterator insert( const value_type& x )\
        return result;\
 } )
 
        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,\
 FUNCTOR,\
 __WXSTLSET_##TYPE##ARG_IS_UNIQUE, \
 KEY_TYPE,\

diff --git a/utils/HelpGen/src/wxstllst.h b/utils/HelpGen/src/wxstllst.h
index 5a1d1bc46913a469975f3b33be0fe7181249d17e..800fd5a91a4b3cb63603849f02610ef1c04c1b8b 100644 (file)
--- a/utils/HelpGen/src/wxstllst.h
+++ b/utils/HelpGen/src/wxstllst.h
@@ -17,7 +17,9 @@
 #endif
 
 #include <stddef.h>
 #endif
 
 #include <stddef.h>

-#include <sys/types.h>
+#if !defined(__WXMAC__) || defined(__DARWIN__)
+#  include <sys/types.h>
+#endif

 #include <memory.h>
 #include <limits.h>
 #include <new.h>
 #include <memory.h>
 #include <limits.h>
 #include <new.h>


@@ -556,4 +558,4 @@ public:\
 \
 _WXSTL_LIST_##ELEMENT_CLASS, ELEMENT_CLASS )
 
 \
 _WXSTL_LIST_##ELEMENT_CLASS, ELEMENT_CLASS )
 

-#endif
\ No newline at end of file
+#endif

diff --git a/utils/HelpGen/src/wxstlvec.h b/utils/HelpGen/src/wxstlvec.h
index 6658b07559c3c78e48f9cc8eec3511e9c93250d8..c7b2daf27cccb48be5b902d8c18b769459d8def2 100644 (file)
--- a/utils/HelpGen/src/wxstlvec.h
+++ b/utils/HelpGen/src/wxstlvec.h
@@ -19,7 +19,9 @@
 #include <memory.h>
 #include <string.h>  // imports memmove()
 #include <stddef.h>
 #include <memory.h>
 #include <string.h>  // imports memmove()
 #include <stddef.h>

-#include <sys/types.h>
+#if !defined(__WXMAC__) || defined(__DARWIN__)
+#  include <sys/types.h>
+#endif

 #include <limits.h>
 #include <new>
 
 #include <limits.h>
 #include <new>