AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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); \
}

14
src/msw/main.cpp
View File

@ -28,7 +28,6 @@
#pragma hdrstop
#endif
#include "wx/init.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/cmdline.h"
@ -69,13 +68,13 @@ static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
// Windows-specific wxEntry
// ----------------------------------------------------------------------------
int wxEntry(WXHINSTANCE hInstance,
WXHINSTANCE WXUNUSED(hPrevInstance),
int wxEntry(HINSTANCE hInstance,
HINSTANCE WXUNUSED(hPrevInstance),
char *pCmdLine,
int nCmdShow)
{
// remember the parameters Windows gave us
wxSetInstance((HINSTANCE)hInstance);
wxSetInstance(hInstance);
wxApp::m_nCmdShow = nCmdShow;
// parse the command line
@ -106,10 +105,7 @@ int PASCAL WinMain(HINSTANCE hInstance,
LPSTR lpCmdLine,
int nCmdShow)
{
return wxEntry((WXHINSTANCE) hInstance,
(WXHINSTANCE) hPrevInstance,
lpCmdLine,
nCmdShow);
return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
}
#else // _WINDLL
@ -127,7 +123,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
return wxEntry((WXHINSTANCE) hModule);
return wxEntry(hModule);
case DLL_PROCESS_DETACH:
wxEntryCleanup();