X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af7b970e76b9886838401933a869423f0a7216a2..28a156b14caceb3869034dd83b033c10f1fa0b4e:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index cb327df858..5538e053bd 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -380,35 +380,18 @@ 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 - #ifdef(__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 + #include + #include "wx/msw/winundef.h" + + #define IMPLEMENT_WXWIN_MAIN \ + extern "C" int WXAPIENTRY WinMain(HINSTANCE hInstance,\ + HINSTANCE hPrevInstance,\ + LPSTR m_lpCmdLine, int nCmdShow)\ + {\ + return wxEntry((WXHINSTANCE) hInstance,\ + (WXHINSTANCE) hPrevInstance,\ + m_lpCmdLine, nCmdShow);\ + } #else #define IMPLEMENT_WXWIN_MAIN #endif