Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrections for compilation under Mac OS X

Browse Source 
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
This commit is contained in:
Gilles Depeyrot
2001-11-18 12:25:12 +00:00
parent 52b64b0a78
commit ad05396006
10 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/HelpGen/src/.cvsignore Normal file
View File

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

BIN
utils/HelpGen/src/HelpGenM5.mcp Normal file
View File

Binary file not shown.

3
utils/HelpGen/src/cjparser.cpp
View File

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

7
utils/HelpGen/src/ifcontext.cpp
View File

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

4
utils/HelpGen/src/scriptbinder.cpp
View File

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

7
utils/HelpGen/src/sourcepainter.cpp
View File

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

7
utils/HelpGen/src/srcparser.cpp
View File

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

20
utils/HelpGen/src/wxstlac.h
View File

@@ -17,7 +17,9 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #if !defined(__WXMAC__) || defined(__DARWIN__)
# include <sys/types.h>
#endif
#include <memory.h> #include <memory.h>
#include <limits.h> #include <limits.h>
#include <new.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,\ FUNCTOR,\
__WXSTLMAP_##KEY_TYPE##VAL_TYPE##ARG_IS_UNIQUE, \ __WXSTLMAP_##KEY_TYPE##VAL_TYPE##ARG_IS_UNIQUE, \
struct key_value_pair { KEY_TYPE first ; \ struct key_value_pair { KEY_TYPE first ; \
VAL_TYPE second;\ VAL_TYPE second;\
key_value_pair() {}\ key_value_pair() {}\
key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \ key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \
: first(key) ___WXSTL_COMMA second( value ) {} \ : first(key) ___WXSTL_COMMA second( value ) {} \
} , \ } , \
KEY_TYPE,\ KEY_TYPE,\
VAL_TYPE,\ VAL_TYPE,\
mData.first, mData.second, x.first, x.second, \ 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,\ FUNCTOR,\
__WXSTLSET_##TYPE##ARG_IS_UNIQUE, \ __WXSTLSET_##TYPE##ARG_IS_UNIQUE, \
KEY_TYPE,\ KEY_TYPE,\

6
utils/HelpGen/src/wxstllst.h
View File

@@ -17,7 +17,9 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #if !defined(__WXMAC__) || defined(__DARWIN__)
# include <sys/types.h>
#endif
#include <memory.h> #include <memory.h>
#include <limits.h> #include <limits.h>
#include <new.h> #include <new.h>
@@ -556,4 +558,4 @@ public:\
\ \
_WXSTL_LIST_##ELEMENT_CLASS, ELEMENT_CLASS ) _WXSTL_LIST_##ELEMENT_CLASS, ELEMENT_CLASS )
#endif #endif

4
utils/HelpGen/src/wxstlvec.h
View File

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