Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix from Mumit Khan to allow mingw DLL compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-10 07:29:51 +00:00
parent d853016702
commit af7b970e76
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/wx/app.h
View File

@@ -380,15 +380,35 @@ public:
#define WXAPIENTRY WXFAR wxSTDCALL #define WXAPIENTRY WXFAR wxSTDCALL
#endif #endif
#define IMPLEMENT_WXWIN_MAIN \ // Patch from Mumit Khan to allow DLL compilation under mingw. Note that
int WXAPIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,\ // this includes <windows.h> which is a bad thing because it prevents
LPSTR m_lpCmdLine, int nCmdShow )\ // 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
return wxEntry((WXHINSTANCE) hInstance, \ #ifdef(__GNUWIN32__)
(WXHINSTANCE) hPrevInstance,\ #include <windows.h>
m_lpCmdLine, nCmdShow);\ #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
#else #else
#define IMPLEMENT_WXWIN_MAIN #define IMPLEMENT_WXWIN_MAIN
#endif #endif