MFC sample now works properly; WinMain not defined in wxMSW

if wxUSE_MFC is defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/mfc/mfctest.cpp

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

src/msw/main.cpp

@@ -33,6 +33,12 @@
 
 #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
 extern void WXDLLEXPORT wxEntryCleanup();