From 848bb8e625cb4164af78b8a4039c28890851ed3d Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Fri, 31 Mar 2000 16:16:05 +0000 Subject: [PATCH] For DLL builds, the declaration of WinMain now takes fake arguments (WXHINSTANCE, WXHINSTANCE, char*, int) in order to avoid the need of #including from app.h. Also, WinMain is now declared as extern "C". git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/app.h | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/include/wx/app.h b/include/wx/app.h index ab9e88a562..464a789e57 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -380,35 +380,13 @@ public: #define WXAPIENTRY WXFAR wxSTDCALL #endif - // Patch from Mumit Khan to allow DLL compilation under mingw. Note that - // this includes which is a bad thing because it prevents - // wxWindows to work with MFC, so for now I'm making this change for - // mingw/cygwin only (these don't work with MFC yet). GRG Mar/2000 - #if defined(__GNUWIN32__) - #include - #include "wx/msw/winundef.h" - - #define IMPLEMENT_WXWIN_MAIN \ - extern "C" int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int);\ - int WINAPI WinMain(HINSTANCE hInstance, \ - HINSTANCE hPrevInstance,\ - LPSTR m_lpCmdLine, int nCmdShow )\ - {\ - return wxEntry((WXHINSTANCE) hInstance, \ - (WXHINSTANCE) hPrevInstance,\ - m_lpCmdLine, nCmdShow);\ - } - #else - #define IMPLEMENT_WXWIN_MAIN \ - int WXAPIENTRY WinMain(HINSTANCE hInstance, \ - HINSTANCE hPrevInstance,\ - LPSTR m_lpCmdLine, int nCmdShow )\ - {\ - return wxEntry((WXHINSTANCE) hInstance, \ - (WXHINSTANCE) hPrevInstance,\ - m_lpCmdLine, nCmdShow);\ - } - #endif + #define IMPLEMENT_WXWIN_MAIN \ + extern "C" int WXAPIENTRY WinMain(WXHINSTANCE hInstance,\ + WXHINSTANCE hPrevInstance,\ + char *m_lpCmdLine, int nCmdShow)\ + {\ + return wxEntry(hInstance, hPrevInstance, m_lpCmdLine, nCmdShow);\ + } #else #define IMPLEMENT_WXWIN_MAIN #endif