diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index d1a53cc228..a2c75a5c17 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -1483,14 +1483,6 @@ // Windows-only settings // ---------------------------------------------------------------------------- -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - // Set this to 1 for generic OLE support: this is required for drag-and-drop, // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and // can't compile/doesn't have the OLE headers. diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 0a768dd1f7..288b42df50 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -1513,14 +1513,6 @@ // Windows-only settings // ---------------------------------------------------------------------------- -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - // Set this to 1 for generic OLE support: this is required for drag-and-drop, // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and // can't compile/doesn't have the OLE headers. diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 1450460f0a..0966c65005 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -164,21 +164,6 @@ #endif /* __GNUWIN32__ */ -/* wxUSE_MFC is not defined when using configure as it doesn't make sense for - gcc or mingw32 anyhow */ -#ifndef wxUSE_MFC - #define wxUSE_MFC 0 -#endif /* !defined(wxUSE_MFC) */ - -/* MFC duplicates these operators */ -#if wxUSE_MFC -# undef wxUSE_GLOBAL_MEMORY_OPERATORS -# define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -# undef wxUSE_DEBUG_NEW_ALWAYS -# define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif /* wxUSE_MFC */ - #if !wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) # undef wxUSE_CHECKLISTBOX # define wxUSE_CHECKLISTBOX 0 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 04d041509a..e33fc338aa 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1513,14 +1513,6 @@ // Windows-only settings // ---------------------------------------------------------------------------- -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - // Set this to 1 for generic OLE support: this is required for drag-and-drop, // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and // can't compile/doesn't have the OLE headers. diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h index 21baf4e092..20f2b40945 100644 --- a/include/wx/msw/setup_inc.h +++ b/include/wx/msw/setup_inc.h @@ -40,14 +40,6 @@ // Windows-only settings // ---------------------------------------------------------------------------- -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - // Set this to 1 for generic OLE support: this is required for drag-and-drop, // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and // can't compile/doesn't have the OLE headers. diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 421ddfb1a3..3231580c36 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -1483,14 +1483,6 @@ // Windows-only settings // ---------------------------------------------------------------------------- -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - // Set this to 1 for generic OLE support: this is required for drag-and-drop, // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and // can't compile/doesn't have the OLE headers. diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp index b3001cbef7..2c838aa54f 100644 --- a/samples/mfc/mfctest.cpp +++ b/samples/mfc/mfctest.cpp @@ -24,14 +24,9 @@ #define START_WITH_MFC_WINDOW 0 +// NOTES: // -// IMPORTANT NOTES: -// -// (1) You may need to set wxUSE_MFC to 1 in include/wx/msw/setup.h but -// normally this shouldn't be needed any longer, i.e. it works without -// it for me (VZ) -// -// (2) You should link with MFC DLL, not static libraries: or, to use static +// * You should link with MFC DLL, not static libraries: or, to use static // run-time libraries, use this command for both building wxWidgets and // the sample: // @@ -40,7 +35,7 @@ // Unless the run-time library settings match for wxWidgets and MFC, you // will get link errors for symbols such as __mbctype, __argc, and __argv // -// (3) If you see bogus memory leaks within the MSVC IDE on exit, in this +// * If you see bogus memory leaks within the MSVC IDE on exit, in this // sample or in your own project, you must be using __WXDEBUG__ + // WXUSINGDLL + _AFXDLL // Unfortunately this confuses the MSVC/MFC leak detector. To do away with diff --git a/setup.h.in b/setup.h.in index 6de5c1dadb..c975db80a1 100644 --- a/setup.h.in +++ b/setup.h.in @@ -646,8 +646,6 @@ #endif -#define wxUSE_MFC 0 - #define wxUSE_OLE 0 #define wxUSE_OLE_AUTOMATION 0 diff --git a/setup.h_vms b/setup.h_vms index be81858f28..b245e4da61 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -711,8 +711,6 @@ typedef pid_t GPid; #define wxUSE_GRAPHICS_DIRECT2D 0 #endif -#define wxUSE_MFC 0 - #define wxUSE_OLE 0 #define wxUSE_OLE_AUTOMATION 0