AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved WinMain into the application even for static build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-16 15:30:25 +00:00
parent 35c49c4bb6
commit ac9a3c615a
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/app.h
View File

@ -593,7 +593,7 @@ public:
#if !wxUSE_GUI || !defined(__WXMSW__) #if !wxUSE_GUI || !defined(__WXMSW__)
#define IMPLEMENT_WXWIN_MAIN \ #define IMPLEMENT_WXWIN_MAIN \
int main(int argc, char **argv) { return wxEntry(argc, argv); } int main(int argc, char **argv) { return wxEntry(argc, argv); }
#elif defined(__WXMSW__) && defined(WXUSINGDLL) #elif defined(__WXMSW__)
// we need HINSTANCE declaration to define WinMain() // we need HINSTANCE declaration to define WinMain()
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"

24
src/msw/main.cpp
View File

@ -95,27 +95,7 @@ extern "C"
// Note that WinMain is also defined in dummy.obj, which is linked to // Note that WinMain is also defined in dummy.obj, which is linked to
// an application that is using the DLL version of wxWindows. // an application that is using the DLL version of wxWindows.
#if !defined(_WINDLL) #if defined(_WINDLL)
#ifdef __WXWINCE__
int WINAPI WinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPWSTR lpCmdLine,
int nCmdShow)
{
return wxEntry(hInstance, hPrevInstance, (char*) lpCmdLine, nCmdShow);
}
#else
int PASCAL WinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
int nCmdShow)
{
return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
}
#endif
#else // _WINDLL
// DLL entry point // DLL entry point
@ -144,7 +124,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
return TRUE; return TRUE;
} }
#endif // _WINDLL/!_WINDLL #endif // _WINDLL
} // extern "C" } // extern "C"