X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3e28ade43cf9d6bd1c158280939870249cc9d2a..fc4aca1838fb7bbc3da677c72039564bff51cbff:/src/msw/main.cpp diff --git a/src/msw/main.cpp b/src/msw/main.cpp index c293e7c511..9f96ac237c 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -95,27 +95,7 @@ extern "C" // Note that WinMain is also defined in dummy.obj, which is linked to // an application that is using the DLL version of wxWindows. -#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 +#if defined(_WINDLL) // DLL entry point @@ -144,7 +124,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) return TRUE; } -#endif // _WINDLL/!_WINDLL +#endif // _WINDLL } // extern "C"