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

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index 7121cc136c5326514b4bc7dccc5a69dac722b512..7615f0fac7a3d0240df8783fab8796af01593710 100644 (file)
--- a/samples/mfc/mfctest.cpp
+++ b/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
 bool MyApp::OnInit(void)
 {
   // Don't exit app when the top level frame is deleted

-//  SetExitOnFrameDelete(FALSE);
+  SetExitOnFrameDelete(TRUE);

   
   wxFrame* frame = CreateFrame();
   return TRUE;
   
   wxFrame* frame = CreateFrame();
   return TRUE;

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 6803110d507b83db10d280311bbdacaef097275b..00736a1394dce0105eaadb95984c6e55762313c7 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -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
 extern void WXDLLEXPORT wxEntryCleanup();
 
 // from src/msw/app.cpp
 extern void WXDLLEXPORT wxEntryCleanup();