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

Remove unnecessary wxUSE_MFC option.

Browse Source 
This didn't do (almost) anything, so just remove it, using MFC and wxWidgets
together works just fine without it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-12-16 20:16:16 +00:00
parent ea47af08cb
commit a580f0b994
9 changed files with 3 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/android/setup.h
View File

@@ -1483,14 +1483,6 @@
// Windows-only settings // 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, // 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 // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
// can't compile/doesn't have the OLE headers. // can't compile/doesn't have the OLE headers.

8
include/wx/gtk/setup0.h
View File

@@ -1513,14 +1513,6 @@
// Windows-only settings // 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, // 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 // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
// can't compile/doesn't have the OLE headers. // can't compile/doesn't have the OLE headers.

15
include/wx/msw/chkconf.h
View File

@@ -164,21 +164,6 @@
#endif /* __GNUWIN32__ */ #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__) #if !wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
# undef wxUSE_CHECKLISTBOX # undef wxUSE_CHECKLISTBOX
# define wxUSE_CHECKLISTBOX 0 # define wxUSE_CHECKLISTBOX 0

8
include/wx/msw/setup0.h
View File

@@ -1513,14 +1513,6 @@
// Windows-only settings // 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, // 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 // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
// can't compile/doesn't have the OLE headers. // can't compile/doesn't have the OLE headers.

8
include/wx/msw/setup_inc.h
View File

@@ -40,14 +40,6 @@
// Windows-only settings // 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, // 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 // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
// can't compile/doesn't have the OLE headers. // can't compile/doesn't have the OLE headers.

8
include/wx/univ/setup0.h
View File

@@ -1483,14 +1483,6 @@
// Windows-only settings // 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, // 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 // clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
// can't compile/doesn't have the OLE headers. // can't compile/doesn't have the OLE headers.

11
samples/mfc/mfctest.cpp
View File

@@ -24,14 +24,9 @@
#define START_WITH_MFC_WINDOW 0 #define START_WITH_MFC_WINDOW 0
// NOTES:
// //
// IMPORTANT NOTES: // * You should link with MFC DLL, not static libraries: or, to use static
//
// (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
// run-time libraries, use this command for both building wxWidgets and // run-time libraries, use this command for both building wxWidgets and
// the sample: // the sample:
// //
@@ -40,7 +35,7 @@
// Unless the run-time library settings match for wxWidgets and MFC, you // Unless the run-time library settings match for wxWidgets and MFC, you
// will get link errors for symbols such as __mbctype, __argc, and __argv // 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__ + // sample or in your own project, you must be using __WXDEBUG__ +
// WXUSINGDLL + _AFXDLL // WXUSINGDLL + _AFXDLL
// Unfortunately this confuses the MSVC/MFC leak detector. To do away with // Unfortunately this confuses the MSVC/MFC leak detector. To do away with

2
setup.h.in
View File

@@ -646,8 +646,6 @@
#endif #endif
#define wxUSE_MFC 0
#define wxUSE_OLE 0 #define wxUSE_OLE 0
#define wxUSE_OLE_AUTOMATION 0 #define wxUSE_OLE_AUTOMATION 0

2
setup.h_vms
View File

@@ -711,8 +711,6 @@ typedef pid_t GPid;
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D 0
#endif #endif
#define wxUSE_MFC 0
#define wxUSE_OLE 0 #define wxUSE_OLE 0
#define wxUSE_OLE_AUTOMATION 0 #define wxUSE_OLE_AUTOMATION 0