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

MFC sample now works properly; WinMain not defined in wxMSW

Browse Source 
if wxUSE_MFC is defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-17 10:52:10 +00:00
parent 71ea40203d
commit 5f7a7263c3
2 changed files with 93 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/mfc/mfctest.cpp
View File

@@ -263,10 +263,10 @@ BOOL CTheApp::OnIdle(LONG lCount)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Don't exit app when the top level frame is deleted // Exit app when the top level frame is deleted
// SetExitOnFrameDelete(FALSE); SetExitOnFrameDelete(TRUE);
wxFrame* frame = CreateFrame(); (void) CreateFrame();
return TRUE; return TRUE;
} }

6
src/msw/main.cpp
View File

@@ -33,6 +33,12 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
// Don't implement WinMain if we're building an MFC/wxWindows
// hybrid app.
#if wxUSE_MFC && !defined(NOMAIN)
#define NOMAIN 1
#endif
// from src/msw/app.cpp // from src/msw/app.cpp
extern void WXDLLEXPORT wxEntryCleanup(); extern void WXDLLEXPORT wxEntryCleanup();