X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2b1371c97bddec2f6182d91cc37ae163a00b643..85f138db83939ce7c59a942aaecca7fa98168db3:/src/msw/main.cpp?ds=sidebyside diff --git a/src/msw/main.cpp b/src/msw/main.cpp index fd950861b2..7568e9878f 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -34,7 +34,7 @@ #include "wx/msw/private.h" -// Don't implement WinMain if we're building an MFC/wxWindows hybrid app. +// Don't implement WinMain if we're building an MFC/wxWidgets hybrid app. #if wxUSE_MFC && !defined(NOMAIN) #define NOMAIN 1 #endif @@ -61,7 +61,7 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance, HINSTANCE WXUNUSED(hPrevInstance), - char * WXUNUSED(pCmdLine), + wxCmdLineArgType WXUNUSED(pCmdLine), int nCmdShow) { // remember the parameters Windows gave us @@ -107,7 +107,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. +// an application that is using the DLL version of wxWidgets. #if defined(_WINDLL) @@ -117,7 +117,7 @@ BOOL WINAPI DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) { // Only call wxEntry if the application itself is part of the DLL. - // If only the wxWindows library is in the DLL, then the + // If only the wxWidgets library is in the DLL, then the // initialisation will be called when the application implicitly // calls WinMain. #ifndef WXMAKINGDLL @@ -131,8 +131,8 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) break; } #else - (void)hModule; - (void)fdwReason; + (void)hModule; + (void)fdwReason; #endif // !WXMAKINGDLL return TRUE;