Some unnecessary wxUSE_MFC occurences removed following Vadim's experience (see wx...

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index b05ad2b35c488811672a0e97524cd920ca81d440..5e34e7089cdb710fb2a64afef86fa1c890ff8b31 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -20,7 +20,7 @@
          defined(__DIGITALMARS__) || \
          defined(__WATCOMC__) ) ) || \
       defined(__VISAGECPP__) || \
-      defined(__MWERKS__) 
+      defined(__MWERKS__)
 
     #if !defined(NOPCH)
         #define WX_PRECOMP
@@ -39,7 +39,7 @@
 #include "wx/wxchar.h"
 
 // include standard Windows headers
-#if defined(__WXMSW__) && !wxUSE_MFC
+#if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"
 #endif
 

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 7568e9878f23e0ea39c8083a3918a94151f8858d..12feee5bdfa443b7e5d52abe9fb1e1dbe7ac2a12 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -34,11 +34,6 @@
 
 #include "wx/msw/private.h"
 
-// Don't implement WinMain if we're building an MFC/wxWidgets hybrid app.
-#if wxUSE_MFC && !defined(NOMAIN)
-    #define NOMAIN 1
-#endif
-
 #ifdef __BORLANDC__
     // BC++ has to be special: its run-time expects the DLL entry point to be
     // named DllEntryPoint instead of the (more) standard DllMain