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

wxAPIENTRY fixes (?)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-10 15:58:59 +00:00
parent 7d67275288
commit 1222db7263
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/wx/defs.h
View File

@@ -328,15 +328,23 @@ typedef int wxWindowID;
// portable calling conventions macros // portable calling conventions macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxCALLBACK should be used for the functions which are called back by // stdcall is used for all functions called by Windows under Windows
// Windows (such as compare function for wxListCtrl) #ifdef __WINDOWS__
#if defined(__WIN32__) #if defined(__GNUWIN32__)
#if defined(__MINGW32__) || defined(__GNUWIN32__)
#define wxCALLBACK __attribute__((stdcall)) #define wxCALLBACK __attribute__((stdcall))
#else #else
// both VC++ and Borland understand this // both VC++ and Borland understand this
#define wxCALLBACK _stdcall #define wxCALLBACK _stdcall
#endif #endif
#else // Win
// no such stupidness under Unix
#define wxSTDCALL
#endif // platform
// wxCALLBACK should be used for the functions which are called back by
// Windows (such as compare function for wxListCtrl)
#if defined(__WIN32__)
#define wxCALLBACK wxSTDCALL
#else #else
// no stdcall under Unix nor Win16 // no stdcall under Unix nor Win16
#define wxCALLBACK #define wxCALLBACK
@@ -1781,6 +1789,17 @@ typedef WXHWND WXWidget;
#endif #endif
#endif #endif
// the keywords needed for WinMain() declaration
#ifdef __WIN16__
#ifndef FAR
#ifdef __VISUALC__
#define FAR __far
#else // !VC++
#define FAR _far
#endif
#endif // no FAR
#endif // Win16/32
#endif // MSW #endif // MSW
#ifdef __WXMOTIF__ #ifdef __WXMOTIF__