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

we can't declare WinMain() with other arguments using Borland, revert to including windows.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-30 21:49:00 +00:00
parent 6b7cbde472
commit 13bdd545fb
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/app.h
View File

@@ -557,15 +557,19 @@ public:
#define IMPLEMENT_WXWIN_MAIN \
int main(int argc, char **argv) { return wxEntry(argc, argv); }
#elif defined(__WXMSW__) && defined(WXUSINGDLL)
// we need HINSTANCE declaration to define WinMain()
#include <windows.h>
#include "wx/msw/winundef.h"
#define IMPLEMENT_WXWIN_MAIN \
extern int wxEntry(WXHINSTANCE hInstance, \
WXHINSTANCE hPrevInstance, \
char *pCmdLine, \
int nCmdShow); \
extern "C" int wxSTDCALL WinMain(WXHINSTANCE hInstance, \
WXHINSTANCE hPrevInstance, \
char *lpCmdLine, \
int nCmdShow) \
extern int wxEntry(HINSTANCE hInstance, \
HINSTANCE hPrevInstance = NULL, \
char *pCmdLine = NULL, \
int nCmdShow = SW_NORMAL); \
extern "C" int WINAPI WinMain(HINSTANCE hInstance, \
HINSTANCE hPrevInstance, \
char *lpCmdLine, \
int nCmdShow) \
{ \
return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
}