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

The WXDLLEXPORT macros now used __declspec (double leading underscore) for

Browse Source 
all MSW compilers. Change proposed by Christoph Schulz.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-04-10 21:50:27 +00:00
parent a8ef3d8656
commit 25935ea919
1 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
include/wx/defs.h
View File

@@ -380,25 +380,8 @@ typedef int wxWindowID;
#if defined(__WXMSW__) #if defined(__WXMSW__)
// _declspec works in BC++ 5 and later, as well as VC++ // __declspec works in BC++ 5 and later, as well as VC++ and gcc
#if defined(__VISUALC__) || defined(__BORLANDC__) #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__)
# ifdef WXMAKINGDLL
# define WXDLLEXPORT _declspec( dllexport )
# define WXDLLEXPORT_DATA(type) _declspec( dllexport ) type
# define WXDLLEXPORT_CTORFN
# elif defined(WXUSINGDLL)
# define WXDLLEXPORT _declspec( dllimport )
# define WXDLLEXPORT_DATA(type) _declspec( dllimport ) type
# define WXDLLEXPORT_CTORFN
# else
# define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type
# define WXDLLEXPORT_CTORFN
# endif
#elif defined(__GNUC__)
# ifdef WXMAKINGDLL # ifdef WXMAKINGDLL
# define WXDLLEXPORT __declspec( dllexport ) # define WXDLLEXPORT __declspec( dllexport )
# define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type # define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
@@ -412,6 +395,7 @@ typedef int wxWindowID;
# define WXDLLEXPORT_DATA(type) type # define WXDLLEXPORT_DATA(type) type
# define WXDLLEXPORT_CTORFN # define WXDLLEXPORT_CTORFN
# endif # endif
#endif
#elif defined(__WXPM__) #elif defined(__WXPM__)
@@ -429,17 +413,14 @@ typedef int wxWindowID;
# define WXDLLEXPORT_CTORFN # define WXDLLEXPORT_CTORFN
# endif # endif
#else #else // !(MSW or OS2)
# define WXDLLEXPORT # define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type # define WXDLLEXPORT_DATA(type) type
# define WXDLLEXPORT_CTORFN # define WXDLLEXPORT_CTORFN
#endif #endif
#else // !Windows
# define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type
# define WXDLLEXPORT_CTORFN
#endif // Win/!Win
// For ostream, istream ofstream // For ostream, istream ofstream
#if defined(__BORLANDC__) && defined( _RTLDLL ) #if defined(__BORLANDC__) && defined( _RTLDLL )
@@ -1678,27 +1659,27 @@ typedef enum {
#ifdef __WXMAC__ #ifdef __WXMAC__
typedef WindowPtr WXHWND; typedef WindowPtr WXHWND;
typedef Handle WXHANDLE; typedef Handle WXHANDLE;
typedef CIconHandle WXHICON; typedef CIconHandle WXHICON;
//typedef unsigned long WXHFONT; //typedef unsigned long WXHFONT;
typedef MenuHandle WXHMENU; typedef MenuHandle WXHMENU;
//typedef unsigned long WXHPEN; //typedef unsigned long WXHPEN;
//typedef unsigned long WXHBRUSH; //typedef unsigned long WXHBRUSH;
//typedef unsigned long WXHPALETTE; //typedef unsigned long WXHPALETTE;
typedef CursHandle WXHCURSOR; typedef CursHandle WXHCURSOR;
typedef RgnHandle WXHRGN; typedef RgnHandle WXHRGN;
//typedef unsigned long WXHACCEL; //typedef unsigned long WXHACCEL;
//typedef unsigned long WXHINSTANCE; //typedef unsigned long WXHINSTANCE;
typedef GWorldPtr WXHBITMAP; typedef GWorldPtr WXHBITMAP;
//typedef unsigned long WXHIMAGELIST; //typedef unsigned long WXHIMAGELIST;
//typedef unsigned long WXHGLOBAL; //typedef unsigned long WXHGLOBAL;
typedef GrafPtr WXHDC; typedef GrafPtr WXHDC;
typedef unsigned int WXUINT; typedef unsigned int WXUINT;
typedef unsigned long WXDWORD; typedef unsigned long WXDWORD;
typedef unsigned short WXWORD; typedef unsigned short WXWORD;
//typedef unsigned int WXWPARAM; //typedef unsigned int WXWPARAM;
//typedef long WXLPARAM; //typedef long WXLPARAM;
typedef RGBColor WXCOLORREF; typedef RGBColor WXCOLORREF;
//typedef void * WXRGNDATA; //typedef void * WXRGNDATA;
//typedef void * WXMSG; //typedef void * WXMSG;
//typedef unsigned long WXHCONV; //typedef unsigned long WXHCONV;
@@ -1708,12 +1689,26 @@ typedef RGBColor WXCOLORREF;
//typedef void * WXLPCREATESTRUCT; //typedef void * WXLPCREATESTRUCT;
typedef int (*WXFARPROC)(); typedef int (*WXFARPROC)();
typedef WindowPtr WXWindow; typedef WindowPtr WXWindow;
typedef ControlHandle WXWidget; typedef ControlHandle WXWidget;
#endif #endif
#if defined(__WXMSW__) || defined(__WXPM__) #if defined(__WXMSW__) || defined(__WXPM__)
// the keywords needed for WinMain() declaration
#ifdef __WIN16__
# ifdef __VISUALC__
# define WXFAR __far
# else
# define WXFAR _far
# endif
#else // Win32
# ifndef WXFAR
# define WXFAR
# endif
#endif // Win16/32
// Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or os2.h // Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or os2.h
typedef unsigned long WXHWND; typedef unsigned long WXHWND;
typedef unsigned long WXHANDLE; typedef unsigned long WXHANDLE;
@@ -1726,7 +1721,7 @@ typedef unsigned long WXHPALETTE;
typedef unsigned long WXHCURSOR; typedef unsigned long WXHCURSOR;
typedef unsigned long WXHRGN; typedef unsigned long WXHRGN;
typedef unsigned long WXHACCEL; typedef unsigned long WXHACCEL;
typedef unsigned long WXHINSTANCE; typedef void WXFAR * WXHINSTANCE;
typedef unsigned long WXHBITMAP; typedef unsigned long WXHBITMAP;
typedef unsigned long WXHIMAGELIST; typedef unsigned long WXHIMAGELIST;
typedef unsigned long WXHGLOBAL; typedef unsigned long WXHGLOBAL;
@@ -1814,29 +1809,15 @@ typedef struct tagLOGPALETTE
typedef WXHWND WXWidget; typedef WXHWND WXWidget;
#if defined(__BORLANDC__) && !defined(__WIN32__) #if defined(__BORLANDC__) && !defined(__WIN32__)
#ifndef LPTSTR # ifndef LPTSTR
#define LPTSTR LPSTR # define LPTSTR LPSTR
#endif # endif
#ifndef LPCTSTR # ifndef LPCTSTR
#define LPCTSTR LPSTR # define LPCTSTR LPSTR
#endif # endif
#endif #endif
// the keywords needed for WinMain() declaration #endif // MSW or OS2
#ifdef __WIN16__
#ifdef __VISUALC__
#define WXFAR __far
#else // !VC++
#define WXFAR _far
#endif
#else // Win32
#ifndef WXFAR
#define WXFAR
#endif
#endif // Win16/32
#endif // MSW
#ifdef __WXMOTIF__ #ifdef __WXMOTIF__
/* Stand-ins for X/Xt/Motif types */ /* Stand-ins for X/Xt/Motif types */